merge conflicts abound