ack, broke --merge-mode command line parsing