Added a test string for merge conflict testing.