fixing compile
solving conflicts