Fix double merges in push

[horner]

Now doing rebase https://github.com/mieweb/wikiGDrive/commit/a1807ca4e1d212cbefe9b66ebfd724f2ddfa213d