update .gitignore for ios
fix conflict