Fixed bug in merge() and updated changes on drop operations