modified test.txt to promt merge conflict
conflict fixed