Fix up bad conflict resolution