this is for git auto complete
this is a commit in branch testing
this is a modification in the branch master
this is a commit in the tmaster branch
this is modification from branch tmaster

¨
this merge message is awlsome !!!
Conflicts:
	testAmend