rename err to conflict for #1
0.6.2