Revert "Fixing merge conflict"

This reverts commit 836ff962c79233eb67068b1afac1ca0fd5e45473.