diff --git a/casts/free-podcasts-screencasts-en.md b/casts/free-podcasts-screencasts-en.md index 5d4d5bcd9..69f7f775b 100644 --- a/casts/free-podcasts-screencasts-en.md +++ b/casts/free-podcasts-screencasts-en.md @@ -251,6 +251,7 @@ * [Ladybug Podcast](https://www.ladybug.dev) - Kelly Vaughn, Ali Spittel, Emma Bostian, Sidney Buckner (podcast) * [Learn to Code with Me](https://learntocodewith.me/podcast/) - Laurence Bradford (podcast) * [Loosely Coupled](https://looselycoupled.info) - Jeff Carouth, Matt Frost (podcast) +* [Merge Conflict](https://www.mergeconflict.fm) - Frank Krueger, James Montemagno (podcast) * [.NET Rocks!](https://www.dotnetrocks.com) - Carl Franklin, Richard Campbell (podcast) * [Open Source System Podcast](https://opensourcesystempodcast.vf.io) - Vlad Filippov, Kyle Robinson Young, Tim Branyen, Darcy Clarke, Mike Taylor, Alex Sexton, Jason Etcovitch (podcast) * [Programming Throwdown](https://www.programmingthrowdown.com) - Jason Gauci, Patrick Wheeler (podcast)