remote repo has unmerged files, push doesn't change site.

githell

$ git init drtest
Initialized empty Git repository in /Users/rangetutoring/Desktop/drtest/.git/
$ cd drtest
$ nodester app info devinrhode2
nodester info Gathering information about: devinrhode2
nodester info devinrhode2 on port 14777 running: true (pid: 4858)
nodester info gitrepo: git@nodester.com:/node/git/devinrhode2/......git
nodester info appfile: server.js
$ git remote add nodester git@nodester.com:/node/git/devinrhode2/.........git
$ git remote
nodester
$ git pull nodester master
Nodester!
remote: Counting objects: 1981, done.
remote: Compressing objects: 100% (1535/1535), done.
remote: Total 1981 (delta 214), reused 1958 (delta 198)
Receiving objects: 100% (1981/1981), 4.24 MiB | 652 KiB/s, done.
Resolving deltas: 100% (214/214), done.
From nodester.com:/node/git/devinrhode2/6624-....
 * branch            master     -> FETCH_HEAD

**Viewed code in repo... already has the changes I want/need**

$ git status
# On branch master
nothing to commit (working directory clean)
$ git push nodester master
Nodester!
Everything up-to-date
**I'll go make an edit...**
$ git status
# On branch master
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   views/index.jade
#
no changes added to commit (use "git add" and/or "git commit -a")
$ git commit -am "changed gradient to go from blue to green"
[master 90cf10b] changed gradient to go from blue to green
 1 files changed, 1 insertions(+), 1 deletions(-)
$ git push nodester master
Nodester!
Counting objects: 7, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 425 bytes, done.
Total 4 (delta 2), reused 0 (delta 0)
remote: Syncing repo with chroot
remote: A	.DS_Store
remote: A	node_modules/.DS_Store
remote: A	node_modules/express
  ... I removed the massive file list of node_modules ...
remote: A	node_modules/stylus
remote: A	npm-debug.log
remote: A	package.json
remote: U	server.js
remote: A	views/head.jade
remote: A	views/index.jade
remote: A	views/layout.jade
remote: A	views/search copy.jade
remote: A	views/search.jade
remote: **Pull is not possible because you have unmerged files.** <- But it's the remote repo.. can't do this.
remote: Please, fix them up in the work tree, and then use 'git add/rm <file>'
remote: as appropriate to mark resolution, or use 'git commit -a'.
remote: Attempting to restart your app: 6624-b...
remote: {"status":"restarted"}
remote: App restarted..
remote: 
remote:   \m/ Nodester out \m/
remote: 
To git@nodester.com:/node/git/devinrhode2/......git
   452ff86..90cf10b  master -> master

**Site does not reflect changes pushed!**
$ git push --force nodester master does not change the site either.