Unmerged paths: frankmocap

mona@goku:~/research/code/phosa/external/frankmocap$ git status
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 1 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:
	modified:   demo/demo_bodymocap.py
	modified:   demo/demo_handmocap.py
	modified:   requirements.txt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   demo/demo_frankmocap.py