Memo to self: Merge conflicts don't simply get "solved" - pt. I