Coca-Cola Ireland conflict resolved