Revert "Fix merge conflict"

This reverts commit e36c289b21c34d035259da215fb985ae3cb8f471.