Corrected packet send logic
Fixed merge conflict