diff --git a/ADHamaApp/src/hama.cpp b/ADHamaApp/src/hama.cpp
index f045b08..ccbfa43 100644
--- a/ADHamaApp/src/hama.cpp
+++ b/ADHamaApp/src/hama.cpp
@@ -1259,11 +1259,8 @@ asynStatus Hama::writeFloat64(asynUser *pasynUser, epicsFloat64 value){
            printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue);
       }
     }
-<<<<<<< HEAD
-=======
     */
 
->>>>>>> Add new pv to get timestamp from EVR
     else if (index == hTimingReadoutTime) {
       printf("[DEBUG]::function TimingReadoutTime %f\n", value); 
       m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_TIMING_READOUTTIME, &dvalue);