delete files
fix conflicts