Fix a few more merge conflicts in index.ios.js: initialroute line 75
Fix a few more merge conflicts in index.ios.js: initialroute line 75

sf-red-pandas-2016/simul-react-native,sf-red-pandas-2016/simul-react-native,sf-red-pandas-2016/simul-react-native