diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
index 7875bb376..e474335fb 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
@@ -663,11 +663,7 @@ sub Dump {
 
 sub debug {
   my $log = shift;
-<<<<<<< HEAD
-  $log->logPrint(DEBUG, @_);
-=======
   $log->logPrint(DEBUG, @_, caller);
->>>>>>> storageareas
 }
 
 sub Debug( @ ) {
diff --git a/src/zm_camera.h b/src/zm_camera.h
index 96e987c1a..1d11b7b1c 100644
--- a/src/zm_camera.h
+++ b/src/zm_camera.h
@@ -117,9 +117,8 @@ public:
 
   virtual int PrimeCapture() { return 0; }
   virtual int PreCapture() = 0;
-  virtual int Capture(Image &image) = 0;
+  virtual int Capture(ZMPacket &p)=0;
   virtual int PostCapture() = 0;
-  virtual int CaptureAndRecord(Image &image, timeval recording, char* event_directory) = 0;
   virtual int Close() = 0;
 };
 
diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 3977c22c5..9d02d0d05 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -146,14 +146,9 @@ Event::Event(
       errno = 0;
       if ( mkdir(path.c_str(), 0755) ) {
         // FIXME This should not be fatal.  Should probably move to a different storage area.
-<<<<<<< HEAD
         if ( errno != EEXIST ) {
           Error("Can't mkdir %s: %s", path.c_str(), strerror(errno));
         }
-=======
-        if ( errno != EEXIST )
-          Error("Can't mkdir %s: %s", path, strerror(errno));
->>>>>>> storageareas
       }
       if ( i == 2 )
         strncpy(date_path, path.c_str(), sizeof(date_path));