Remove merge markers left over after merge