valgrind is not working
fixed merges