Revert "Conflicts was resolved"

Reverts EricpolUkraine/Ajour#325