Git is rather timid with merge conflicts. If you change two adjacent lines, it assumes they conflict! https://softwareengineering.stackexchange.com/questions/194788/why-doesnt-git-merge-adjacent-lines-without-conflict
In my experience they don't, and it causes problems when library imports change at the top of the file. Interestingly, Subversion happily merges.
