removing the merge from git config fixed it. Adding extra pushes back

after this commit, check if git config merge line gets changed to add
gh-pages
the merge = refs/heads/gh-pages gets added to config automatically when adding the extra pushes

this screws up pusing to master. Added line merge = refs/heads/master
below the merge = refs/heads/gh-pages in hopes that it will now commit
to both...
try using the + to see if it still screws it up
changed order of push in config