user2 add foo
after merge