Use ChecksumFinder class
Test both merge modes, and use new ChecksumFinder class.
Initial commit