Fix default conflict resolver
0.1.8