change again
Merge branch 'feature1' of github.com:exi/demo into feature1
Merge branch 'feature1' of github.com:exi/demo into feature1

Conflicts:
	test.txt
change message
Merge branch 'feature1'
Merge branch 'master' of github.com:exi/demo