Add Cho's blog post on merge conflicts