gistfile1.txt

Question 1
Some steps could be done to avoid conflicts, like: short-living branches, create small modules, 
strong communication and mob programming (Reference: https://github.com/hli30/git-mania)

Question 2
Other than the recommendation above, merge conflict will always be something to look out for when working in a team.
Conflicts must be manually resolved prior to pushing.