diff --git a/params/stereo_camera_example.yaml b/params/stereo_camera_example.yaml
index a588b41..e84351a 100644
--- a/params/stereo_camera_example.yaml
+++ b/params/stereo_camera_example.yaml
@@ -1,5 +1,4 @@
 cam_ids:
-<<<<<<< HEAD
 - 17197554
 - 17197556
 cam_aliases:
@@ -29,7 +28,6 @@ distortion_coeffs:
 - [-0.021141875266089592, -0.3733872931278025, 2.385982550579459, 3.2824571732099725]
 - [-0.021141875266089592, -0.3733872931278025, 2.385982550579459, 3.2824571732099725]
 
-
 #specified as [fx  0 cx 0 fy cy 0  0  1]
 intrinsic_coeffs:
 - [1886.9232141485886, 0.0, 604.7214878709341, 0.0, 1886.6668765711668, 493.47726714719823, 0.0, 0.0, 1.0]
@@ -42,7 +40,6 @@ rectification_coeffs:
 projection_coeffs:
 - [913.700317, 0.000000, 953.448302, 0.000000, 0.000000, 1063.296631, 777.871993, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000]
 - [913.700317, 0.000000, 953.448302, 0.000000, 0.000000, 1063.296631, 777.871993, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000]
-<<<<<<< HEAD
 
 flip_horizontal:
 - false
@@ -51,5 +48,3 @@ flip_horizontal:
 flip_vertical:
 - false
 - false
-=======
->>>>>>> master