comming back to d7xxx
solving old conflicts