some code changes
Fix merge conflict in test.foo