Resolve an inadvertently commited merge conflict in readme.
Resolve an inadvertently commited merge conflict in readme.

SolaceSamples/solace-samples-cloudfoundry-java,SolaceSamples/solace-samples-cloudfoundry-java