Moved onDrop event to bottom of setTo method
Fixed merge conflict