branch add something
test is modified in branch feature1
test is modified in branch master
Merge branch 'feature1'

Conflicts:
	test
conflict fixed
test modify
merge with no-ff