Revert "fix conflict test"

This reverts commit 07b2dae8dff062655cbe4fe2330dd6ba1ec67559.