Test change to demonstrate merging