removed dropbox merge conflict