branch test
modified local.txt
conflict
Merge branch 'feature1'

Conflicts:
	local.txt
add merge
merge with no-ff
commit
merge with noff
Just
bugfix
conflict fixed
add ignore files