diff --git a/src/merge.cpp b/src/merge.cpp
index 8cd71c4..81f3942 100644
--- a/src/merge.cpp
+++ b/src/merge.cpp
@@ -8,11 +8,7 @@ namespace hdrplus
 {
 
 void merge::process( const hdrplus::burst& burst_images, \
-<<<<<<< HEAD
                      std::vector<std::vector<std::vector<std::pair<int, int>>>>& alignments)
-=======
-                     std::vector<std::vector<std::vector<std::pair<int, int>>>>& alignments )
->>>>>>> Create merge branch
 {
     double lambda_shot, lambda_read;
     std::tie(lambda_shot, lambda_read) = merge::getNoiseParams(ISO, white_level, black_level);