Answer for 2.2
Merge conflict