fixing clientcommand valgrind errors
fixed merge conflicts