Fix up multi-tty merge