Modify get noise param accordingly

src/merge.cpp

@@ -11,7 +11,6 @@ void merge::process( const hdrplus::burst& burst_images, \
                      std::vector<std::vector<std::vector<std::pair<int, int>>>>& alignments)
 {
     double lambda_shot, lambda_read;
-<<<<<<< HEAD
     std::tie(lambda_shot, lambda_read) = burst_images.bayer_images[burst_images.reference_image_idx].get_noise_params();
 
     // Obtain tiles
@@ -24,9 +23,6 @@ void merge::process( const hdrplus::burst& burst_images, \
             reference_tiles.push_back(tile);
         }
     }
-=======
-    std::tie(lambda_shot, lambda_read) = merge::getNoiseParams(ISO, white_level, black_level);
->>>>>>> Compute lambda_shot and lambda_read