project B changes
Merge branch 'project-B'

Conflicts:
	file-1.txt
	file-4.txt