edit tariff page
removed merge conflict