Fixed bug in merge -s option