copy many files from old project
conflict fixed