Add dropzone
Merge conflict