Revert "fixed conflict"

This reverts commit 0a61a4533e32d4f4cb2dbd7d2d2f3d5899fd164d.