Revert "resolved merge conflict"

This reverts commit c6a745810c84686fd7c874c31fe82ea8305ba819.