Manual Merge UI updates