merging conflicts is dumb