kAIto47802
Resolved conflict in README.md
b55d767