added valgrind
fixed merge conflicts