Hey Simran!
You need to download ToroiseSVN or TortoiseGit depending on your repository to resolve external conflicts like these.
Once you install it you will need to restart and then you can leverage the conflict resolution with this
Read more here:
https://community.mendix.com/link/space/deployment/questions/92516
Hope this helps!