Merge conflict test
Agreed on changes