updating demo and docs
fixing conflicts