Fixed UI Merge