fixed merge
to aid debugging
updated deps