fixed merge conflict
fixed merge conflict

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