fix the merge conflicts

README.md

src/GenFind/include/GenFindHits.h

src/GenFind/include/HoughTransform.h

src/GenFind/src/GenFindHits.cxx

src/GenFind/src/HoughTransform.cxx

src/GenFind/tests/conformal_transform_test.cxx

src/GenFind/tests/fit_test1.cxx

src/GenFind/tests/hough_transform2.cxx

src/GenFind/tests/hough_transform3.cxx

src/GenFind/tests/ht_test.cxx

src/GenFind/tests/simple_example_out.root