How do you handle merge conflicts and version control in a team environment when working on Vergent LMS features?