fixed one more bug. during stress testing

This fixed the docker container health errors. just there is no mcp connection still.

1st pass at merging the code bases(does not run yet)