fix checkMerge, and tests
Merge pull request #453 from matiu/feature/builder01

fix checkMerge, and tests