Upgraded the Kafka version
Resolved Conflict