adding basics
solving conflicts