I know how to resolve conflicts. I just report this and I'd like to know whether I can continue and delete the repo once your team has logged this issue.
Thank you @imba-tjd for letting us know. We will look into this, and see if other users are experiencing a similar conflict. Please feel free to continue with the course, and if you need any help or run into anything else strange, please let us know. :)