delete couple of things
Merge remote-tracking branch 'origin/master1' into master1
Merge remote-tracking branch 'origin/master1' into master1
add
Merge remote-tracking branch 'origin/master1' into master1