Forgot to remove HEAD from a conflicting merge. Resolved