diff --git a/api/publish.go b/api/publish.go
index aa45750a..9b10e65f 100644
--- a/api/publish.go
+++ b/api/publish.go
@@ -477,13 +477,12 @@ func apiPublishUpdateSwitch(c *gin.Context) {
 			}
 		}
 
-<<<<<<< HEAD
 		result, err := published.Update(collectionFactory, out)
 		if err != nil {
 			return &task.ProcessReturnValue{Code: http.StatusInternalServerError, Value: nil}, fmt.Errorf("Unable to update: %s", err)
 		}
 
-		err = published.Publish(context.PackagePool(), context, collectionFactory, signer, out, b.ForceOverwrite)
+		err = published.Publish(context.PackagePool(), context, collectionFactory, signer, out, b.ForceOverwrite, context.SkelPath())
 		if err != nil {
 			return &task.ProcessReturnValue{Code: http.StatusInternalServerError, Value: nil}, fmt.Errorf("Unable to update: %s", err)
 		}
diff --git a/deb/publish.go b/deb/publish.go
index 7205a176..df8ad10f 100644
--- a/deb/publish.go
+++ b/deb/publish.go
@@ -783,7 +783,7 @@ func (p *PublishedRepo) GetSkelFiles(skelDir string, component string) (map[stri
 	}
 
 	fsPath := filepath.Join(skelDir, p.Prefix, "dists", p.Distribution, component)
-	if err := filepath.Walk(fsPath, func(path string, info os.FileInfo, err error) error {
+	if err := filepath.Walk(fsPath, func(path string, _ os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
@@ -813,7 +813,7 @@ func (p *PublishedRepo) GetSkelFiles(skelDir string, component string) (map[stri
 
 // Publish publishes snapshot (repository) contents, links package files, generates Packages & Release files, signs them
 func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorageProvider aptly.PublishedStorageProvider,
-	collectionFactory *CollectionFactory, signer pgp.Signer, progress aptly.Progress, forceOverwrite, skelDir string) error {
+	collectionFactory *CollectionFactory, signer pgp.Signer, progress aptly.Progress, forceOverwrite bool, skelDir string) error {
 	publishedStorage := publishedStorageProvider.GetPublishedStorage(p.Storage)
 
 	err := publishedStorage.MkDir(filepath.Join(p.Prefix, "pool"))
diff --git a/deb/publish_test.go b/deb/publish_test.go
index 4ce9c4ce..c2d228ac 100644
--- a/deb/publish_test.go
+++ b/deb/publish_test.go
@@ -197,7 +197,7 @@ func (s *PublishedRepoSuite) TestNewPublishedRepo(c *C) {
 func (s *PublishedRepoSuite) TestMultiDistPool(c *C) {
 	repo, err := NewPublishedRepo("", "ppa", "squeeze", nil, []string{"main"}, []interface{}{s.snapshot}, s.factory, true)
 	c.Assert(err, IsNil)
-	err = repo.Publish(s.packagePool, s.provider, s.factory, &NullSigner{}, nil, false)
+	err = repo.Publish(s.packagePool, s.provider, s.factory, &NullSigner{}, nil, false, "")
 	c.Assert(err, IsNil)
 
 	publishedStorage := files.NewPublishedStorage(s.root, "", "")