add release
add release 2
commit
Merge branch 'release'

Conflicts:
	.project