hello, this is the first commit 21
this is 2nd commit
this is the 3 commit
added file 5
added file 6
added file7
added file8
Merge branch 'testing1'
changed file 1
changed file 1
Merge branch 'dev'

Conflicts:
	hello1.txt
Merge branch 'master' of https://github.com/gangsir/testgit