learngit fix test.cc
conflict fixed