rm merge conflict HEAD