Merge conflict issue in module 2

I am stuck here. How to resolve these merge conflicts?

Hi @sid99
Looks like you are facing challenges in the current module.

Below is a link to all the FAQ’s for the current module

Below are a few similar topics raised by other users which you might find usefull

Note - This is a BETA Feature,if you find this helpful, kindly let us know.
Feedback link -

Kindly mark this as a solution if this has helped you solve your query

Hi @sid99

To resolve merge conflict. Open the file shown in red.

You have 3 options in that file Accept Incoming , Accept Current , Accept Both .

Choose one of options wisely so that your code don’t break.

Closing this topic as your issue is resolved by the mentor. If it is still not resolved, Kindly un-mark the accepted solution or create a new topic and post this question as a reference link in the description of the new topic.