adding conflict to project1
Merge commit '30d89275c5c905169574555863ca4a41c8b4dabb'

Conflicts:
	moduleA/newSharedModuleCode.txt