After I merged a file in Git I tried to pull the repository but error came up:
You have not concluded your merge. (MERGE_HEAD exists)
I had the same error and i did followed article found on google solves my issue. You have not concluded your merge