Merge branch 'v26.2-dev' into pose_buffer

Author: tbowers7

doc/RBSI-Vision.md

@@ -72,7 +72,11 @@ using a measuring tape to compare the reported vision-derived distance from
 each camera to one or more AprilTags with reality.
 
 
+<<<<<<< HEAD
 #### Using PhotonVision for Vision Simulation
+=======
+#### Using PhotonVision for vision simulation
+>>>>>>> v26.2-dev
 
 This is an advanced topic, and is therefore in the Restricted Section.  (More
 information about vision simulation to come in a future release.)