Resolve conflicts after stash pop

hypothetical_scenes/rendered_h3_nonlinear_128P/part_001/ref_scene_128P.csv

@@ -1,4 +1,4 @@
-ID,volume_ball         ,radius_ball         ,volume_cylinder     ,radius_cylinder     ,height_cylinder     ,tilt_angle          ,noise_1                 ,image
+ID,volume_ball,radius_ball,volume_cylinder,radius_cylinder,height_cylinder,tilt_angle,noise_1,image
         1 ,0.23459849915257136 ,0.3826005059721821  ,0.569191972758752   ,0.22375469195963163 ,3.6188000876934936  , 4.249022030659164  ,0.005135798644490502    ,./database/rendered_h3_nonlinear_1_128P/7fd6de8df4b447eab5101c8caed471c2.png
         2 ,0.10052331922663041 ,0.2884426013758498  ,0.230069060073269   ,0.12946087446329488 ,4.369495265661141   , 1.8458664302495802 ,0.026903944468274925    ,./database/rendered_h3_nonlinear_1_128P/9c81500774db4c36b2c5afca09a24d37.png
         3 ,0.47282233081419367 ,0.48328478580742495 ,0.5360137319981847  ,0.23750822575199732 ,3.0246054645500755  , 4.261372098892546  ,-0.00044912085671136267 ,./database/rendered_h3_nonlinear_1_128P/47d4b543bcfa46d299ec01dbba69880d.png