Revert back to original state
Fix the merge conflict in Operator.h