Updated window sizes for acks
Fixed merge conflicts