Fix merge UI

This regressed with #1320.