Revert "Resolving conflict"

This reverts commit e1984145d2ba8b47921f218b21bac4b2bb6d3807.