Getting started on feature1
Changed to totally
changed second line
Checking merge function

Merge branch 'feature1'
add some text to file1
change to file1
Merge branch 'feature1'

Conflicts:
	file1