merge in changes in buffer and resend management