Blocking out Drag and drop
Fixed a bug with Merge where the overwriting data still ended up creating a Merge folder and adding itself to it