merging ui updates