Merge conflicts are dumb.