2/7

added table
solving contflict