merge stuff
make sure z is in the things