fix merge conflict, for reals
fix merge conflict, for reals

purplecabbage/cordova-plugin-device,apache/cordova-plugin-device,dingguijin/cordova-plugin-device,dingguijin/cordova-plugin-device,purplecabbage/cordova-plugin-device,purplecabbage/cordova-plugin-device,apache/cordova-plugin-device,purplecabbage/cordova-plugin-device,dingguijin/cordova-plugin-device,dingguijin/cordova-plugin-device