renamed OperationConflict to MergeConflict interface
renamed OperationConflict to MergeConflict interface

googleinterns/spec-math,googleinterns/spec-math,googleinterns/spec-math,googleinterns/spec-math