branch 2
hotfix
Merge branch 'b2'
b2 conflict
master
Merge conflict

Conflicts:
	project.txt