The way is this way.
test message
Merge branch 'master' into nadias-branch

Conflicts:
	story.txt