initial merge command

Benjamin Mako Hill || Want to submit a patch?