Changes to make a better merge conflict