mooore codez
conflict solved