Added operands
Fixed operands
Conflict resolution