this transition is possible when action has been decided on the other side of the sync

bt5/erp5_syncml/WorkflowTemplateItem/portal_workflow/syncml_signature_validation_workflow/states/conflict.xml

@@ -22,6 +22,7 @@
             <key> <string>transitions</string> </key>
             <value>
               <tuple>
+                <string>no_conflict</string>
                 <string>resolve_conflict_with_client_command_winning</string>
                 <string>resolve_conflict_with_merge</string>
               </tuple>

bt5/erp5_syncml/bt/revision

-111
\ No newline at end of file
+112
\ No newline at end of file