Revert "fix merge error"

This reverts commit 82a37ff2183cde203677cf0b3bfa0072bbe78d79.