adding a test file
changed someFile's text
Merge branch 'dev'

Conflicts:
	someFile.txt