mobile - fixing conflicts
fixing the last conflicts and more