Merge tolerance

There have been two major changes to the merge tolerance.