add example of git conflict test
1 file changed