adding multiple file
adding a branch
merging check
master
add the feature
another commit
merge
Merge branch 'feature'

Conflicts:
	test.txt