"Conflict resolution" is not available like on Azure. Check if possible to add it or if there is a need to update the used SDK.