add a new brach
add feature1
master add
confilt brech
brach
commit
Merge branch 'dev'

Conflicts:
	readme.txt