Add 3c-conflict blog post
Incorporate comments from @majek and lgilliam. Also, fix some typos