add test for git cf
auto resolve conflict