merge conflict test
 ant-git ok