Removed confliced files from Dropbox