Story-1 fix is done
Story-2 is completed
Story-3 is completed
Story-4 is completed
Merge branch 'story-2' into dev

Conflicts:
	newfile.txt
Merge branch 'Story-3' into dev

Conflicts:
	newfile.txt
Merge branch 'Story-4' into dev

Conflicts:
	newfile.txt