Modified as a Merge conflict example.
Fixed merge conflicts