removing dropbox's 'conflicted copys' of files in Lab6_test