set up kitchen pool stuff
fixed merge
mergeeee