More WIP on merge ui