visual fix
merging logic fixed