From 556c64268cd58cb3e958f261b9be0aaed5658d2b Mon Sep 17 00:00:00 2001
From: Zachary Snow <zachary.snow@gmail.com>
Date: Wed, 4 Apr 2018 08:29:06 +0200
Subject: [PATCH] Added "Merge Conflict" to .NET.

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 1aa3711..619ce3c 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,11 @@ List of podcasts which are helpful for software engineers/programmers.
   - <b>Description</b>: show covering a broad range of .NET-related topics in considerable technical depth.
   - <b>Frequency</b>: Monthly once
 
+- [Merge Conflict](http://www.mergeconflict.fm/)
+
+  - <b>Description</b>: Join Frank & James for a weekly discussion on the world of technology and development including C#, F#, .NET, web, mobile, and more.
+  - <b>Frequency</b>: Weekly
+  
 ## Agile
 
 - [Agile For Humans](https://ryanripley.com/agile-for-humans/)