if (conflict.has("theirs") && conflict.get("theirs").isJsonPrimitive()) {
String theirCommit = conflict.get("theirs").getAsJsonPrimitive().getAsString();
Optional<NodeRef> theirNode = parseID(ObjectId.valueOf(theirCommit), featureId,
ggit);
if (theirNode.isPresent()) {
Optional<RevObject> object = ggit.command(RevObjectParse.class)
.setObjectId(theirNode.get().objectId()).call();
Preconditions.checkState(object.isPresent()
&& object.get() instanceof RevFeature);
theirFeature = (RevFeature) object.get();