some more modifications
solving conflict