fix ui
resolve conflicts:
fix ui