Conflict Resolution Sample Code should include mergeRevisions() sample

First comment:

Per https://github.com/couchbase/couchbase-lite-ios/issues/617, it's not clear what meta-data should be included into the merged properties when setting to a new revision's .properties property. This may be solved by either :
1. Provide a proper mergeRevisions() sample
2. Instead of use .properties, use .userProperties instead.

Reference Doc Section: http://developer.couchbase.com/mobile/develop/guides/couchbase-lite/native-api/document/index.html#Understanding%20Conflicts

see other comments: https://github.com/couchbaselabs/couchbase-mobile-portal/issues/176