for branch master
for dev
fix conflict
fix bug
after debug
Merge branch 'dev'

Conflicts:
	testgit1.txt