diff --git a/tao_compiler/mlir/disc/transforms/lhlo_legalize_roots_to_loops.cc b/tao_compiler/mlir/disc/transforms/lhlo_legalize_roots_to_loops.cc
index 73b1feaaa68..664c9747c57 100644
--- a/tao_compiler/mlir/disc/transforms/lhlo_legalize_roots_to_loops.cc
+++ b/tao_compiler/mlir/disc/transforms/lhlo_legalize_roots_to_loops.cc
@@ -169,8 +169,13 @@ LogicalResult miscLowerHelper(OpBuilder& b, Location loc, Operation* opaque_op,
     memref = cast<lmhlo::LmhloOp>(&*op).getOperation()->getOperand(1);
   }
 
+<<<<<<< Updated upstream
   // for inplace scatter op, output_index according to update_index, the
   // operand(2) of lmhlo::ScatterOp
+=======
+  // for inplace scatter op, output_index according to update_index, the
+  // operand(2) of lmhlo::ScatterOp
+>>>>>>> Stashed changes
   if (isa<lmhlo::ScatterOp>(op) && isInplaceOperator(op)) {
     memref = cast<lmhlo::ScatterOp>(&*op).getOperation()->getOperand(2);
   }