[UI] fixed merged