# Annoying issues when merging conflicts on the Node Red editor

**URL:** <https://discourse.nodered.org/t/annoying-issues-when-merging-conflicts-on-the-node-red-editor/56653>\
**Category:** General\
**Created:** [14 January 2022 13:45 UTC](https://discourse.nodered.org/t/annoying-issues-when-merging-conflicts-on-the-node-red-editor/56653 "2022-01-14T13:45:06Z")\
**Posts on this page:** 2\
**Page:** 1

<div class="post-metadata">

**Author:** ![idimitrakopoulos](https://sea2.discourse-cdn.com/flex026/user_avatar/discourse.nodered.org/idimitrakopoulos/32/35586_2.png) [@idimitrakopoulos](https://discourse.nodered.org/u/idimitrakopoulos)\
**Post date:** [14 January 2022 13:45 UTC](https://discourse.nodered.org/t/annoying-issues-when-merging-conflicts-on-the-node-red-editor/56653/1 "2022-01-14T13:45:06Z")

</div>

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)

 ![image (15)](https://us1.discourse-cdn.com/flex026/uploads/nodered/original/3X/1/1/114b657937b9d9457ea1837160ef81f870dd411b.png)

Has anyone encountered these issues ? Any workarounds ?

---

<div class="post-metadata">

**Author:** ![system](https://us1.discourse-cdn.com/flex026/uploads/nodered/original/1X/d073cd938eafa2e558d7c2cd59003b3ef4963033.png) [@system](https://discourse.nodered.org/u/system)\
**Post date:** [15 March 2022 13:45 UTC](https://discourse.nodered.org/t/annoying-issues-when-merging-conflicts-on-the-node-red-editor/56653/2 "2022-03-15T13:45:59Z")

</div>

This topic was automatically closed 60 days after the last reply. New replies are no longer allowed.