Packet timeouts and resending
Fixed merge conflicts and fininishe checksum between sender and receiver