Revert "Fixing conflict"

This reverts commit 142142a2317fc16625e130b0194084cfb2ce2d84.