diff --git a/src/msckf_vio.cpp b/src/msckf_vio.cpp
index 0462dc7..3d87a0d 100644
--- a/src/msckf_vio.cpp
+++ b/src/msckf_vio.cpp
@@ -1356,9 +1356,7 @@ void MsckfVio::PhotometricMeasurementJacobian(
   r = r_l;
   H_x = H_xl;
   H_y = H_yl;
-<<<<<<< HEAD
-  // calculate residual
-=======
+
 
   //TODO make this more fluent as well
   count = 0; 
@@ -1372,7 +1370,6 @@ void MsckfVio::PhotometricMeasurementJacobian(
     feature.MarkerGeneration(marker_pub, state_server.cam_states);
     feature.VisualizePatch(cam_state, cam_state_id, cam0, photo_r, ss, gradientVector, residualVector);
   }
->>>>>>> photometry-jakobi
 
   return;
 }