Annoying issues when merging conflicts on the Node Red editor

Hello there are 2 very annoying issues we are encountering when trying to merge conflicts between 2 branches (between develop branch and feature branch)

Issue #1

When we edit flows we have the case where some blocks get rearranged elsewhere within the JSON file and of course, they are marked as conflicts.

Is there a way to sticky them so that they aren't rearranged?

Issue #2

When merging we are allowed to pick either one of the blocks which is fine but we also would like to have the opportunity to merge them (or allow editing)

Has anyone encountered these issues ? Any workarounds ?