modify a.txt 3
commit file a text file
comit a text file in dev branch
Mdfasdf

erge branch 'dev'

Conflicts:
	a.txt