Deleted HEAD text after merge conflict