Added a test string for merge conflict testing.
Fixing syntax error