.gitignore更新
fix conflict