update

2 files changed, 3 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9f129757f8fc..e476579111ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,7 +11,7 @@ pkgbase = bake-sl-git
 	provides = bake
 	conflicts = bake-sl-git
 	conflicts = bake
-	source = bake::git://github.com/semplice/bake.git#branch=semplice
+	source = bake::git://github.com/semplice/bake.git#branch=master
 	md5sums = SKIP
 
 pkgname = bake-sl-git
diff --git a/PKGBUILD b/PKGBUILD
index 6134bba1c205..533ef031a9ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Gary DeLaney <gld1982ltd@gmail.com>
 
 _gitroot="git://github.com/semplice/bake.git"
-_gitbranch="semplice"
+_gitbranch="master"
 _gitname="bake"
 
 pkgname="$_gitname-sl-git"
@@ -31,6 +31,7 @@ pkgver() {
 
 prepare() {
 	cd "$srcdir/${pkgname%-sl-git}"
+	git merge --no-edit origin/semplice
 	git merge --no-edit origin/python_version
 	git merge --no-edit origin/gir_lookup
 }