2 files changed, 2 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index acccc1cdc8db..6729ccf21a7e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,8 +12,8 @@ pkgbase = chessx
 	optdepends = stockfish: for a chess engine
 	optdepends = lc0-cudnn-git: for another chess engine
 	conflicts = chessx-svn
-	source = https://sourceforge.net/projects/chessx/files/chessx/1.5.0/chessx-1.5.0.tgz
-	sha256sums = d130ad3220821da9ea19e7228222a5528fabca3ca06bc41b4d7f702454f63827
+	source = https://sourceforge.net/projects/chessx/files/chessx/1.5.4/chessx-1.5.4.tgz
+	sha256sums = e2dbacff2a6c055cfbe4ce0344331f77262867e228a5fe2895e6c242772065a8
 
 pkgname = chessx
 
diff --git a/PKGBUILD b/PKGBUILD
index 4b387b8c3461..213d58545525 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,5 @@
 # Maintainer: Munzir Taha <munzirtaha@gmail.com>
 pkgname=chessx
-<<<<<<< HEAD
 pkgver=1.5.4
 pkgrel=2
 pkgdesc="Cross-platform chess database and PGN viewer"