Fixed printing just before send
Fixed conflict