Bugfix causing block solve times on merged to be wrong