upgraded the kafka
Resolved conflict