@Christophe_De_Beule I have been able to handle conflicts using the scripts provided here: Avoid updating issue with older changes ADO <> Jira, Jira <> Jira, ServiceNow <> Jira, ZenDesk <> Jira
@Dhiren although the scripts are not written such that ADO is always the winner, but it is a small customization that should get you there. Let me know if you still need a hand please.
Thanks