Modified as a Merge conflict example.

Modified for merge conflicts.