remove unnecessary files
conflict