Added some text to a file to test merge