fix mobile-desktop conflict