first commit
Fix merge conflict in test.foo