Merge conflicts in main level scene

It seems I have properly broken things messing around with github. I was only trying to make a single project work between two computers, but now I have broken things beyond repair.

This is my console.
The strange thing was when I looked at the Level.unity file, there was nothing between the “=============” and the “>>>>>>>>>>>>>>” to be causing any merge issues!

In this state, I cannot even work on the game.

Use git log to check your last stable commit and then use git checkout “the hash of stable commit” to revert to that commit.

reverting your commit is probably your best bet.

I don’t recommend ever trying to merge scenes. It generally doesn’t work very well. that being said, if you MUST, you can try this: