Revert "Fixed a merge conflict"

This reverts commit a81c1e6e0518499bba6ccf91db57dd42df454702.