new -border-merge command, slight modifications to -*-merge help info