added foobaragain
merged foo.txt