resolved merge conflicts

producer/producer_client.go

@@ -3,12 +3,9 @@ package producer
 import (
 	"com.navi.medici.janus/config"
 	"com.navi.medici.janus/utils"
-	"go.uber.org/zap"
-	"log"
-
 	"crypto/tls"
 	"github.com/Shopify/sarama"
-	"os"
+	"go.uber.org/zap"
 	"strings"
 	"time"
 )
@@ -101,7 +98,6 @@ func GetAsyncProducer(kafkaConfiguration config.KafkaConfigurations, env string)
 }
 
 func InitializeProducers(kafkaConfiguration config.KafkaConfigurations, env string) {
-	sarama.Logger = log.New(os.Stdout, "[sarama] ", log.LstdFlags)
 	logger = utils.GetLogger()
 	syncProducer = GetSyncProducer(kafkaConfiguration, env)
 	asyncProducer = GetAsyncProducer(kafkaConfiguration, env)