How to avoid merge conflicts in a team? How do you resolve conflicts when working with Git?