I'm trying to merge a branch back into my main file and it keeps failing with the generic "Something went wrong… our team is looking into it" error. I've tried a few times with the same result, and status.figma.com shows everything operational, so it doesn't seem to be an outage.
The branch contains a large set of changes. The branch and main file are both still intact the merge simply won't complete.