merge again

docs/guide/render.md

@@ -35,7 +35,7 @@ Additionally, any object can be made into an emissive area light by changing its
 
 In Render mode, simply check the box for "Logged Rays", and you would be able to see the camera rays that you generated in task 1 when you start render.
 
-![ray](log_ray.png)
+![ray](ray_log.png)
 
 ## Visualize BVH
 

docs/pathtracer/environment_lighting.md

@@ -79,7 +79,6 @@ if we want our new distribution to still integrate to 1, we must divide by sin(\
 
 Altogether, the final Jacobian is (wh / 2pi^2 sin(\theta)).
 
-<<<<<<< HEAD
 ---
 
 ### Tips
@@ -92,16 +91,9 @@ Altogether, the final Jacobian is (wh / 2pi^2 sin(\theta)).
 - If you didn't use the ray log to debug area light sampling, start using it now to visualize what directions are being sampled from the environment map.
 
 ---
-=======
-![uffiz](new_results/uffiz32importance.png)
->>>>>>> c0f8c29adcde9b20b76232cedf6298f12af43f03
 
 ## Reference Results
 
-<<<<<<< HEAD
 ![ennis](images/ennis.png)
 ![uffiz](images/uffiz.png)
 ![grace](images/grace.png)
-=======
-![ennis](new_results/field1024importance.png)
->>>>>>> c0f8c29adcde9b20b76232cedf6298f12af43f03