fixed merge conflicts
fixed merge conflicts

itinance/react-native-fs,johanneslumpe/react-native-fs,itinance/react-native-fs,johanneslumpe/react-native-fs,johanneslumpe/react-native-fs,itinance/react-native-fs,itinance/react-native-fs