diff --git a/tensorflow_io/core/python/experimental/avro_record_dataset_ops.py b/tensorflow_io/core/python/experimental/avro_record_dataset_ops.py
index d1b686213..6429aac10 100644
--- a/tensorflow_io/core/python/experimental/avro_record_dataset_ops.py
+++ b/tensorflow_io/core/python/experimental/avro_record_dataset_ops.py
@@ -24,16 +24,7 @@
 
 def _require(condition: bool, err_msg: str = None) -> None:
     """Checks if the specified condition is true else raises exception
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-<<<<<<< HEAD
-=======
-    
->>>>>>> 5203f5d9... Exposes num_parallel_reads and num_parallel_calls
-=======
     
->>>>>>> bba69e31... Exposes num_parallel_reads and num_parallel_calls (#1232)
     Args:
         condition: The condition to test
         err_msg: If specified, it's the error message to use if condition is not true.
@@ -44,23 +35,6 @@ def _require(condition: bool, err_msg: str = None) -> None:
     Returns:
         None
     """
-<<<<<<< HEAD
-<<<<<<< HEAD
-    
-=======
-    :param condition: The condition to test
-
-    :param err_msg: If specified, it's the error message to use if condition is not true.
-
-    :raises ValueError: Raised when the condition is false
-
-    :return: None.
-    """
->>>>>>> 21bc6c7c... Exposes num_parallel_reads and num_parallel_calls
-=======
->>>>>>> 5203f5d9... Exposes num_parallel_reads and num_parallel_calls
-=======
->>>>>>> bba69e31... Exposes num_parallel_reads and num_parallel_calls (#1232)
     if not condition:
         raise ValueError(err_msg)
 
@@ -223,13 +197,6 @@ def __init__(
         block_length=1,
     ):
         """Creates a `AvroRecordDataset` to read one or more AvroRecord files.
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
->>>>>>> 5203f5d9... Exposes num_parallel_reads and num_parallel_calls
-=======
->>>>>>> bba69e31... Exposes num_parallel_reads and num_parallel_calls (#1232)
         Args:
           filenames: A `tf.string` tensor or `tf.data.Dataset` containing one or
             more filenames.
@@ -252,25 +219,9 @@ def __init__(
             the degree of parallelism in the underlying Dataset.interleave call.
           reader_schema: (Optional.) A `tf.string` scalar representing the reader
             schema or None.
-<<<<<<< HEAD
-<<<<<<< HEAD
-          deterministic: (Optional.) A boolean controlling whether determinism should be traded for performance by
-          allowing elements to be produced out of order. Defaults to `True`
-          block_length: Sets the number of output on the output tensor. Defaults to 1
-=======
-<<<<<<< HEAD
->>>>>>> 21bc6c7c... Exposes num_parallel_reads and num_parallel_calls
-
-=======
-          deterministic: (Optional.) A boolean controlling whether determinism should be traded for performance by
-          allowing elements to be produced out of order. Defaults to `True`
-          block_length: Sets the number of output on the output tensor. Defaults to 1
->>>>>>> d41d946... Added parameter constraints
-=======
           deterministic: (Optional.) A boolean controlling whether determinism should be traded for performance by
           allowing elements to be produced out of order. Defaults to `True`
           block_length: Sets the number of output on the output tensor. Defaults to 1
->>>>>>> bba69e31... Exposes num_parallel_reads and num_parallel_calls (#1232)
         Raises:
           TypeError: If any argument does not have the expected type.
           ValueError: If any argument does not have the expected shape.