testing merge
fixing test.cpp merge diff