git add .
git commit -m "take pull by command.sh"
git pull origin master


git add .
git commit -m "conflict fix and push by HEAD"
git push origin HEAD 

exit