update ui
fix conflict