clean all files
fix conflict to local