before pull from master
after merge
resolve
Merge branch 'master' of github.com:hsin421/Insite
yes
Everything is done