fix error : <<< HEAD (git merge conflict tip)