Removed left over HEAD from previous conflict