head taken out of merge conflict