Module 2 cant understand where is merge conflict

I cannot understand where actually merge conflict is occuring ?
I cannot understand the hint given by terminal

please look at this image and help me to resolve this

ive accepted changes in but stil getting same error

Hey. Please look at this video on how to resolve the merge conflicts.

Follow carefully and patiently, you can do it!

I’ve done same thing that they’ve shown but still same problem occurs

I’ve got another error after this merge conflict
I’ve tried to post image using python
But I’m getting error like can’t open file

Hey. Please check all your files for conflicts. You still haven’t resolved all.

Any further issues please raise a new ticket. A TA will get to you.