pakeistas 2x2
conflict resolved