updated the lists
solving conflicts