fix merge conflicts
allow git push to use additional ssh opts
remove additional verbosity
resolve merge conflicts
allow git to use extra ssh options with push.sh (like quiet)