deleteCollection now actually deletes the collection
fixed merge conflicts