mobile ipad
fixed merge conflicts