Merge Conflict in Module 2

How to resolve merge conflict in module 2 when we run pull command

do check this https://crio-assist.zendesk.com/hc/en-us/articles/360039170434

thanks
the problem is solved