styles in appmobile
fixed conflicts of the merge