adding variables file
solving conflicts