message: Remove markers
diff: @@ -542,7 +542,6 @@ class RangeTest(test.TestCase):
  tf_ans = math_ops.range(
  constant_op.constant(4, dtype=dtypes.int32), dtype=dtypes.int64)
  self.assertAllEqual(self.evaluate(tf_ans), np.array([0, 1, 2, 3]))
  -<<<<<<< HEAD
  def testLargeStarts(self):
  # Test case for GitHub issue 46899.
  @@ -550,7 +549,6 @@ class RangeTest(test.TestCase):
  with self.assertRaises(errors_impl.InternalError):
  v = math_ops.range(start=-1e+38, limit=1)
  self.evaluate(v)
  -=======
  def testLargeLimits(self):
  # Test case for GitHub issue 46913.
  @@ -559,7 +557,6 @@ class RangeTest(test.TestCase):
  v = math_ops.range(0, 9223372036854775807)
  self.evaluate(v)
  ->>>>>>> 6d94002a097 (Merge pull request #51359 from yongtang:46913-range-overflow)
  # TODO(vrv): move to sequence_ops_test?
  class LinSpaceTest(test.TestCase):
  