removing dropbox
Fixed conflict