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)
If you encounter this error in SourceTree, go to Actions>Resolve Conflicts>Restart Merge.
SourceTree version used is 1.6.14.0