After following the steps and removing the markers in “Resolve these Conflicts”, I get the following message from the bot:
"Uh oh @dream-ardor, something went wrong! I wasn’t expecting this change. Please go over the instructions again and make sure you’ve followed them as exactly as you can.
If this is a pull request, you might close it so you can start fresh. Keep trying, you’ll get there!
If you would like assistance troubleshooting the issue you are encountering, create a post on the GitHub Community board. You might also want to search for your issue to see if other people have resolved it in the past."
I tried leaving the course and restarting. I followed the instructions exactly as listed and I’ve searched all over the forums. This is the second time I’ve been confused by this step and I have no idea why I cannot bypass it.