edit a
edit b
Merge branch 'develop' of github.com:akiraak/test into feature/pr1

Conflicts:
	text.txt