mobile-bug-fix
conflict solving..