I have a branch feature/packet-events. I want to merge this into develop.

I have an open PR, but it says it has conflicts. GitHub UI button is greyed out and tells me to use the CLI.

I’ve gone to the cli and ran git merge develop whilst on my feature branch and nothing happens?

I can’t seem to find a way to merge this