Update 2014-02-14-conflict-was-resolved.md