2014/index.html: removed the merge conflict text.