Major Update
REM: duplicate files from dropbox conflict