fix merge conflicts and fix indeterminate test