I don’t think I’m alone in saying this; early in my career, merge conflicts were the bane of my...