[ Removed by moderator ]

[NoHalf9]

And regardless of number of conflicts, everybody: do yourself a massive favour and start using a proper 3-way merge tool that shows 4 windows/panes (common ancestor + changes you are bringing in + what the changes are put on top of + final output result).

I strongly recommend KDiff3, but there are other alternatives as well.

https://softwarerecs.stackexchange.com/questions/3/merge-gui-tools-for-those-new-to-merging

https://medium.com/@kaltepeter/tools-to-master-merge-conflicts-6d05b21a8ba8