redid thought tracker [Finishes: #71182888] [Finishes: #73300598] [Finishes: #71259940] [Finishes: #74058920]
fixed merge conflict