add all files
fix conflict