Holistics has docs here about how to resolve a merge conflict in the UI. However when I just ran into a merge conflict after pulling from production, it didn’t show me any of conflict markers (<, =, >) mentioned in the docs. There was just a “Resolve” button in the top that I was able to click with no changes made to code, and I’m still not entirely sure what changes ended up being made from attempting to resolve the merge conflict. Is there something additional I need to do? Is this a bug?