fix merge conflict with min.’s