[PATCH] tty: minor merge correction