diff --git a/x86_64/cbsh-session-manager/PKGBUILD b/x86_64/cbsh-session-manager/PKGBUILD
index fac0465..369756c 100644
--- a/x86_64/cbsh-session-manager/PKGBUILD
+++ b/x86_64/cbsh-session-manager/PKGBUILD
@@ -4,13 +4,22 @@ _pkgname=cbsh-session-manager
 pkgver=1.0.r9.5bd8cb0
 pkgrel=1
 epoch=
+<<<<<<< HEAD
 pkgdesc="A Basic Session Manager Specific for CBSH"
+=======
+pkgdesc="A Simple Session manager for CBSH"
+>>>>>>> 933c2e5 (Add cbsh-welcome to repos)
 arch=('x86_64')
 url="https://www.gitlab.com/cbsh/cbsh-session-manager.git"
 license=('GPL3')
 groups=()
+<<<<<<< HEAD
 depends=(python-gobject gtk3)
 makedepends=(git)
+=======
+depends=()
+makedepends=(git python-build python-installer python-wheel)
+>>>>>>> 933c2e5 (Add cbsh-welcome to repos)
 checkdepends=()
 optdepends=()
 provides=(cbsh-session-manager)
@@ -35,7 +44,11 @@ build() {
 }
 
 package() {
+<<<<<<< HEAD
     cd cbsh-session-manager
+=======
+    cd "${_pkgname}"
+>>>>>>> 933c2e5 (Add cbsh-welcome to repos)
     python -m installer --destdir="$pkgdir" dist/*.whl
 
     install -Dm775 cbsh-session-manager "${pkgdir}/usr/local/bin/cbsh-session-manager"
diff --git a/x86_64/cbsh-welcome/PKGBUILD b/x86_64/cbsh-welcome/PKGBUILD
new file mode 100644
index 0000000..4682f5f
--- /dev/null
+++ b/x86_64/cbsh-welcome/PKGBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Cameron Miller <cameron@codecameron.dev>
+pkgname=cbsh-welcome
+_pkgname=cbsh-welcome
+pkgver=1.0
+pkgrel=1
+epoch=
+pkgdesc="The Welcome App and Tweaker for CBSH"
+arch=('x86_64')
+url="https://www.gitlab.com/cbsh/cbsh-welcome.git"
+license=('GPL3')
+groups=()
+depends=()
+makedepends=(git python-build python-installer python-wheel)
+checkdepends=()
+optdepends=()
+provides=(cbsh-welcome)
+conflicts=()
+replaces=()
+backup=()
+options=()
+changelog=
+source=("git+$url")
+noextract=()
+md5sums=('SKIP')
+validpgpkeys=()
+
+pkgver() {
+	cd "${_pkgname}"
+    printf "1.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+build() {
+    cd "${_pkgname}"
+    python -m build --wheel --no-isolation
+}
+
+package() {
+    cd "${_pkgname}"
+    python -m installer --destdir="$pkgdir" dist/*.whl
+
+    install -Dm775 cbsh-welcome "${pkgdir}/usr/local/bin/cbsh-welcome"
+    install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -Dm644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md"
+}