@@ -1,13 +1,17 @@
 ---
-title: "NeuroFly 2026: 21st Biennial European Drosophila Neurobiology Conference"
+title: "VFB will be giving a talk and live demos at NeuroFly 2026"
 linkTitle: "NeuroFly 2026"
 date: 2025-12-17
 description: >
-    Announcement of NeuroFly 2026 conference in Cologne, Germany, and VFB's plans for a workshop.
+    VFB will be giving a talk and running live demos, alongside our posters, at NeuroFly 2026 in Cologne, Germany.
 ---
 
 The 21st Biennial European Drosophila Neurobiology Conference, NeuroFly 2026, will be held at the University of Cologne, Germany, from September 7th to 11th, 2026. This conference continues the tradition of bringing together researchers from around the world to discuss the latest advancements in Drosophila neurobiology, including studies on neuronal circuits, synapses, connectome, signal transmission, behavior, development, and more. The event emphasizes interdisciplinary interactions in an inclusive environment, featuring a mix of invited talks and abstracts from both junior and senior researchers.
 
+<<<<<<< Updated upstream
 Virtual Fly Brain (VFB) is excited about the upcoming conference and is exploring opportunities to host a workshop/tutorial on connectomics and transcriptomics data we have available, similar to our previous successful sessions such as the one at [NeuroFly 2024](neurofly2024.md) titled 'Bridging connectomics and transcriptomics' ([workshop notebook](http://tinyurl.com/workshopVFB)). This new workshop will introduce available connectomes and transcriptomics data, highlight important differences between datasets, and demonstrate how to perform your own analysis using the latest [tools](/docs/past-workshops/connectome/tools) and [APIs](/docs/tutorials/apis/) for integrating Drosophila neuroscience data. Stay tuned for updates on our participation.
+=======
+Virtual Fly Brain (VFB) will be there. We will be giving a talk about the data and tools we make available, and running live demos during the poster sessions, where you will also find our posters. Come and find us if you would like a hands-on walkthrough. The demos will introduce the connectomics data available on VFB and show you how to perform your own analysis using the latest [tools](/docs/past-workshops/connectome/tools) and [APIs](/docs/tutorials/apis/) for integrating Drosophila neuroscience data. We can also show you how to use AI to query our data directly, through our [MCP tool](/docs/tutorials/vfb-mcp-guide/).
+>>>>>>> Stashed changes
 
 For more information about NeuroFly 2026, including registration, abstract submission, and program details, visit the official website at [https://neurofly.org/home/](https://neurofly.org/home/) or the 2026 conference page at [https://neurofly.org/y2026/](https://neurofly.org/y2026/).