Revert "Fix merge conflict"

This reverts commit 91cf7a0256fde2980e26a3801992d0c9a13e83f3.