Clean up merge heuristic to do what we said it did