fixed pypi badge in readme
fixed pypi version badge in readme
fixed conflict