Fixed README.md merge conflict
Merge branch 'develop'
type fix in README.md
global_config
global_config
typo in readme