create ionic app
fixed merge conflicts