Revert "resolved merge conflict"

This reverts commit 6b26e2df68f9a33f8f1315bc124dfd23875b0b63.