first commit
new commit
new one
asdas
asa
asdsad
asda
Merge branch 'dev'
here
there
Merge branch 'dev'

Conflicts:
	a
Merge branch 'master' of https://github.com/abijith-kp/try_git