Revert "conflict resolve"

This reverts commit 358b5df677f10261118c1087dc6cbf8da0da9cd0, reversing
changes made to 5202331306b2e20ba4b8c13dc135afc02ce12d4b.