added merge, updated display