new Story-1 is completed
new Story-2 is completed
Merge branch 'Story-1' into dev

Conflicts:
	newfile.txt
Merge branch 'story-2' into dev

Conflicts:
	newfile.txt