updated page and examples
fixing conflicts