annoying merge conflict