removed HEAD marker from merge conflict