Remove missed merge conflicts