Example
Merge conflicts fixed