otec: fix to ensure resolvedConflict flag is copied when copying operations