fixed merging issues, removed a test from analyze.cpp