} else if (my instanceof Relation && relationMemberMerger.getModel().isFrozen()) {
RelationMemberListMergeModel model = (RelationMemberListMergeModel) relationMemberMerger.getModel();
commands.add(model.buildResolveCommand((Relation) my, (Relation) their));
}
if (isResolvedCompletely()) {
commands.add(new VersionConflictResolveCommand(conflict));
commands.add(new ModifiedConflictResolveCommand(conflict));
}
return new SequenceCommand(tr("Conflict Resolution"), commands);
}