2 files changed, 8 insertions, 0 deletions
diff --git a/Cargo.lock b/Cargo.lock
index a428d34..f84845d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -247,10 +247,14 @@ dependencies = [
 [[package]]
 name = "soon"
 <<<<<<< HEAD
+<<<<<<< HEAD
 version = "0.1.3"
 =======
 version = "0.1.1"
 >>>>>>> 63967be (feat:  Bump version to 0.1.1 in Cargo.toml and Cargo.lock)
+=======
+version = "0.1.2"
+>>>>>>> fc7b603 (feat:  Bump version to 0.1.2 in Cargo.toml, Cargo.lock, and PKGBUILD)
 dependencies = [
  "clap",
  "colored",
diff --git a/PKGBUILD b/PKGBUILD
index 783edd8..6cec09d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,9 @@
 pkgname=soon
+<<<<<<< HEAD
 pkgver=0.1.3
+=======
+pkgver=0.1.2
+>>>>>>> fc7b603 (feat:  Bump version to 0.1.2 in Cargo.toml, Cargo.lock, and PKGBUILD)
 pkgrel=1
 pkgdesc="🤖 Predict your next shell command based on history — like shell autocomplete, but MORE stupid"
 arch=('x86_64')