adding anti-rollback device
solving coflict