test git
test gi
test 3way merge with conflict