Since we've upgraded to SF2021.1 I notice that the merge sessions always contain conflicts regarding the columns originated_in_project_id and originated_in_project_vrs_id. This happens for example when a template is removed in a branch and then merged back to the trunk (without any other merge sessions in between).

I don't exactly understand why this conflict is there, but it keeps returning. For the example above I've removed a process flow step template, so this one can be resolved choosing the branch value. But I'm not sure if this is intended?