Unable to merge the files in visual studio code from gitlab

Question

Unable to merge the files in visual studio code from gitlab after taking the latest version of code i am getting merge conflicts"C:\Users\DELL\OneDrive\Desktop\localshoppi\localshoppi>git pull error: Pulling is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm ' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict." In visual studio i am unable compare the files(server version & latest version) after taking the latest while merging the files