first commit
second commmit
first commit develop branch
adding test3
4th commit
message for 5th
next
next
next
next
next
next
cacascas
Merge branch 'develop'

Conflicts:
	test2.txt solved
Merge branch 'origin/master'