Fixed README forced merge conflict