Revert "Revert "Fixing merge conflict""

This reverts commit 9b7089515d2a743813bdd6797a2c57a8fbaedbb3.