change master
change master1
no testing
Merge remote-tracking branch 'origin/master' into testing
deleted master string
Merge branch 'testing'
added master string
added testing string