added MCPatchOperation::isConflict like in MCConflict::isConflict, to make a distinction between MCPatchOperations and MCConflicts