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...