I made changes to project A
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	projectA.txt