Use elasticsearch package instead
Resolve conflicts