terrible merge conflicts