r2 valtozas
merge conflict solved