Adding second change
Change #3 to resolve conflict