SatFinder merge fix