Merge branch 'main'

3 files changed, 3 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82cccfafca17..bd2f90a43267 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dashlane-cli-git
 	pkgdesc = Dashlane CLI GitHub repository version bundled with asdf-vm to ensure using the correct node version.
 	pkgver = v1.15.1.r0.g8368d87
-	pkgrel = 61
+	pkgrel = 63
 	url = https://github.com/Dashlane/dashlane-cli
 	install = .INSTALL
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 2816f1b5695a..1050b3201b40 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Stephan Koglin-Fischer <stephan dot koglin-fischer at funzt dot dev>
 pkgname=dashlane-cli-git
 pkgver=v1.15.1.r0.g8368d87
-pkgrel=61
+pkgrel=63
 pkgdesc="Dashlane CLI GitHub repository version bundled with asdf-vm to ensure using the correct node version."
 arch=('x86_64')
 url="https://github.com/Dashlane/dashlane-cli"
diff --git a/justfile b/justfile
index 358985177dda..beed114af1b4 100644
--- a/justfile
+++ b/justfile
@@ -67,7 +67,7 @@ publish: prepare
     @echo -e "\e[36mSwitching to aur master branch...\e[0m"
     @git checkout master
     @echo -e "\e[36mMerging main into aur master...\e[0m"
-    @git merge main
+    @git merge -X theirs main
     @echo -e "\e[36mPushing to aur...\e[0m"
     @git push aur master
     @echo -e "\e[36mSwitching back to main...\e[0m"