Resolve merge conflicts
Now fastopen has it's own retransmit function. Undo aNCR changes