Testing default_merge_ref_for_diffs and conflicts

Open André Luís requested to merge staging-test-branch-2 into staging-test-branch-1

What does this MR do?

Are there points in the code the reviewer needs to double check?

Why was this MR needed?

Screenshots (if relevant)

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?