Solved README.md merge conflict