On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 83 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
You have unmerged paths.
(fix conflicts and run "git commit")
Changes to be committed:
modified: bad_keywords.txt
modified: blacklisted_usernames.txt
modified: blacklisted_websites.txt
modified: gitmanager.py
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: watched_keywords.txt