Update 2014-02-03-resolving-conflict.md