test push conflict
testing
still testing
foo
bar
chao still testing
chao merges
chao foo
chao bar