Fix hidden merge conflicts