не получается запушить на github

kalinins@kalinins-Lenovo-Z580 ~/.virtualenvs/zapsum/zapsum $ git pull origin master
U	db.sqlite3
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.
kalinins@kalinins-Lenovo-Z580 ~/.virtualenvs/zapsum/zapsum $ git push origin master
Username for 'https://github.com': zlodiak
Password for 'https://zlodiak@github.com': 
To https://github.com/zlodiak/zapsum.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/zlodiak/zapsum.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
kalinins@kalinins-Lenovo-Z580 ~/.virtualenvs/zapsum/zapsum $ 

git status

git checkout -- /path/to/file

git stash save

git pull origin master

git stash pop

git add .
git commit -m 'message'
git push origin master