sizify task
solving conflicts