Removed duplicate merge function
Fixed drop_client typo