Working with example
Resolving conflict in example