Fixed one of examples.
Resolved conflicts