merge with cordova-app