Found bug in merge; added cmdline args