Revert "conflict test"

This reverts commit 8d1d114b13068e99752c8607da1eb53f1d0370ec.