update ignore with xcode settings
fix conflict in ignore