update main user ui
fix merge