remove more merge artifacts
Merge pull request #57 from Surram/dropzone

remove more merge artifacts