Add conflicts line for python-elasticsearch-1.0