Created feature branch
modified feature branch
Merge remote-tracking branch 'origin/dev' into feature

Conflicts:
	file.txt
Merge branch 'feature' into dev