fix: resolve merge issues

pkg/container/client.go

@@ -247,7 +247,7 @@ func (client dockerClient) IsContainerStale(c Container) (bool, error) {
 		// the pull request will be aborted prematurely unless the response is read
 		if _, err = ioutil.ReadAll(response); err != nil {
 			log.Error(err)
-		}	
+		}
 	}
 
 	newImageInfo, _, err := client.api.ImageInspectWithRaw(bg, imageName)

pkg/notifications/gotify.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"strings"
 
+	t "github.com/containrrr/watchtower/pkg/types"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -21,7 +22,7 @@ type gotifyTypeNotifier struct {
 	logLevels      []log.Level
 }
 
-func newGotifyNotifier(c *cobra.Command, acceptedLogLevels []log.Level) typeNotifier {
+func newGotifyNotifier(c *cobra.Command, acceptedLogLevels []log.Level) t.Notifier {
 	flags := c.PersistentFlags()
 
 	gotifyURL, _ := flags.GetString("notification-gotify-url")