Getting this Conflict error when trying to merge the branches
I have tried refreshing the page multiple times
I tried with another browser
Contact support
When I had this, I needed to re-add a plugin I’d removed in one of the child branches.
Okay, will contact support
thanks for the reply.