Merge branch 'master' of C:\Users\Administrator\Desktop\MyShop with conflicts.
wendy
wendy
wendy123
Merge remote-tracking branch 'origin/master'
wendy1
Merge remote-tracking branch 'origin/master'