fixing utils.go's bad merge