Correct HEAD problems (linked to merge error)