add something
Merge branch 'dev'

Conflicts:
	readme.txt
and simple
& simple
conflict fixed