fixing dropbox merge issue