Feladat megoldva
resolve conflict