Merge branch 'jc/better-conflict-resolution'