solved merge conflicts

Conflicts:
	hazelcast-documentation/src/JCache.md