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)
How does one conclude a merge?