conflict
conflict 2
Merge branch 'dev'

Conflicts:
	readme.txt
a
b
Merge branch 'dev'

Conflicts:
	readme.txt
b
Merge branch 'dev'
add by master
add by dev
merge