My changes
solving conflicts