More merge conflict mistakes