Cherry-picked commit with merge conflict

Author: ethanwee1

.ci/docker/requirements-ci.txt

@@ -258,10 +258,17 @@ scipy==1.14.1 ; python_version > "3.9"
 #Pinned versions:
 #test that import:
 
+<<<<<<< HEAD
 tb-nightly==2.13.0a20230426
 #Description: TensorBoard
 #Pinned versions:
 #test that import:
+=======
+tlparse==0.3.25
+#Description: parse logs produced by torch.compile
+#Pinned versions:
+#test that import: dynamo/test_structured_trace.py
+>>>>>>> 2feede28593 ([release/2.6] Remove tb-nightly (#2535))
 
 # needed by torchgen utils
 typing-extensions>=4.10.0