fix conflicts

Signed-off-by: Mladjan Gadzic <[email protected]>

Author: mladjan-gadzic

pkg/daemon/daemon.go

@@ -274,8 +274,8 @@ func (d *daemon) becomeLeader() error {
 	log.Info().Msg("Becoming leader, initializing daemon logic")
 
 	// Initialize the GUID pool (rebuild state from existing pods)
-	if err := d.initPool(); err != nil {
-		log.Error().Msgf("initPool(): Leader could not init the guid pool: %v", err)
+	if err := d.initGUIDPool(); err != nil {
+		log.Error().Msgf("initGUIDPool(): Leader could not init the guid pool: %v", err)
 		return fmt.Errorf("failed to initialize GUID pool as leader: %v", err)
 	}