testing merge commit by editing foo.txt