Revert "Conflicts was resolved after merge"

This reverts commit 89a82d0f59527411587fd72f3b6dd4588c662523.