Redo conflict resolution for previous commit

The wrong choice had been made