finished merge