Update 2013-12-31-merge-without-conflicts-in-git.md