Updated examples
Fixed conflicts