I really dislike Git throwing up its hands when doing a merge if when local edited line 11 and remote comes down with an edit to line 12. Neither side conflicted with each other but yet it tells me to fix it myself. All these years, a new merge algorithm, and this is still a problem. 😑