Untangling merge conflicts in your head first…