mobile fixes
conflict resolved