Revert "resolve merge conflict"

This reverts commit a61d0c14811a6afb5b1aea7fd4de2c26d9f0f4cb.
resolve merge conflict