git test for conflict