Resolved conflicts in SVN for file test.txt