Add simple merge script

A lot of times I want to do a merge without the full deploy part. This may be
because the full deploy script is flawed I dunno. It is also because in some
things I can't put the merging in the script because others have to deploy on our
VPN which block pushing. But for now I'm going to have this as it's own script.
Make merge executable