their was a merge conflict in facebook_post.py file and i solved it. but after again running the code it is showing
" 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. "
i looked and i cant find any other conflicts. its not highlighting.