git conflict test