Revert "Fixed merge conflict"

This reverts commit cc14796d296d16eeef9f253689c51c9399716772.