outcome column
Conflicts resolved