README formatting
Fixed merge conflict