Revert "resolve merge conflict"

This reverts commit 2b236e2e2e69fd82070539d0f30925897ea1651d.