diff --git a/configs/faster_rcnn/_base_/faster_reader.yml b/configs/faster_rcnn/_base_/faster_reader.yml
index eaeae9b0ad34a6571dab12fab7d6fa80202e79b3..ebb4e7949654e346b9faaf8a33a78fee0bf32a3c 100644
--- a/configs/faster_rcnn/_base_/faster_reader.yml
+++ b/configs/faster_rcnn/_base_/faster_reader.yml
@@ -34,11 +34,7 @@ TestReader:
   - NormalizeImage: {is_scale: true, mean: [0.485,0.456,0.406], std: [0.229, 0.224,0.225]}
   - Permute: {}
   batch_transforms:
-<<<<<<< HEAD
-  - PadBatch: {pad_to_stride: -1., pad_gt: false}
-=======
   - PadBatch: {pad_to_stride: -1}
->>>>>>> 0fc9950... fix stride data type
   batch_size: 1
   shuffle: false
   drop_last: false
diff --git a/configs/mask_rcnn/_base_/mask_reader.yml b/configs/mask_rcnn/_base_/mask_reader.yml
index c6d4478c8113f711394fc8f824df2ae86467c175..b43d312b82e00903980b686c0cbd4017c2fa8f80 100644
--- a/configs/mask_rcnn/_base_/mask_reader.yml
+++ b/configs/mask_rcnn/_base_/mask_reader.yml
@@ -20,11 +20,7 @@ EvalReader:
   - NormalizeImage: {is_scale: true, mean: [0.485,0.456,0.406], std: [0.229, 0.224,0.225]}
   - Permute: {}
   batch_transforms:
-<<<<<<< HEAD
-  - PadBatch: {pad_to_stride: -1., pad_gt: false}
-=======
   - PadBatch: {pad_to_stride: -1}
->>>>>>> 0fc9950... fix stride data type
   batch_size: 1
   shuffle: false
   drop_last: false
@@ -38,11 +34,7 @@ TestReader:
   - NormalizeImage: {is_scale: true, mean: [0.485,0.456,0.406], std: [0.229, 0.224,0.225]}
   - Permute: {}
   batch_transforms:
-<<<<<<< HEAD
-  - PadBatch: {pad_to_stride: -1., pad_gt: false}
-=======
   - PadBatch: {pad_to_stride: -1}
->>>>>>> 0fc9950... fix stride data type
   batch_size: 1
   shuffle: false
   drop_last: false