improved UI for merging
improved UI for merging