Update README.md

just made sure merge_conflict is actual config value
Merge pull request #53 from mikedfunk/patch-1

Update README.md