branch test
AND simple
& simple
Merge branch 'feature1'

Conflicts:
	git_test
fix bug