ReadyAPI - Pulling changes and working with merge conflicts