Fix HEAD merge leftovers