Update README.md

just made sure merge_conflict is actual config value