Revert "Fix merge conflict"

This reverts commit 14edd8dfadda20dc6ac50a1581fb844a391e6a5f.