edit second and third file
Merge branch 'feature1'

Conflicts:
	thirdfile
add newrebasefile to generate conflict while rebase
add newrebasefile
modify secondfile