fixed some merging problems in tcp_input.c