Fix typo, {value, explanation} for k in conflict example
Merge pull request #1 from ajdm/patch-1

Fix typo, {value, explanation} for k in conflict example