For context: we have a system on our hosting which allows us to deploy git branches of Discourse to certain communities for testing. If the branch has a merge conflict with the latest branch, then this is the error we get.
Clearly though… the error wasn’t supposed to be displayed to everyone. We’ve got that fixed up now. 