Figma Support Forum

Bug: Branch conflict resolution shows branch image on both sides

My file has 4 pages. One page has about 30 frames, and in branch A I have added about 15 more to it. I merged branch B to main, which had some other changes to the same page, and when returning to branch A it reported changes from main were available, as expected. The conflict window showed one conflict with an image of the correct page, but the image in both the main and branch panes was the branch view, with the additional frames. I expected the view in the Main file pane not to show the added frames.

Possibly relevant: branch A also changes the order of the pages in the left sidebar, including the page in question.

UPDATE: Restoring the page order in branch A to match the order in Main removes the conflict. Possibly a bug that’s easy to reproduce.