Dummy code to demonstrate merge conflict resolution. (#X)