first test commit
test 2
commit on github cloned repo
first commit on testing branch
must commit before change branche
commit before marge
testing conflict on merge
conflict among two branches was fixed
Merge remote-tracking branch 'origin/master'