First version of the example
Fixed conflict