Revert "fixed merge error"

This reverts commit 779cf77a8693c0d799f05e9421201e2029c45374.