remove HEAD text from a previously failed merge
Merge branch 'dev'