file1.txt edited
file1.txt master edit
file1 edited
file1 im featureC
Merge branch 'long'

Conflicts:
	file1.txt