merge differences; udpate randomizer