Conflict Resolution - Not As Simple As A, B, or C
Wouldn