diff --git a/libdivsufsort/PKGBUILD b/libdivsufsort/PKGBUILD
index c1e06012d7..6a28afda57 100644
--- a/libdivsufsort/PKGBUILD
+++ b/libdivsufsort/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=libdivsufsort
 pkgver=2.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A lightweight suffix-sorting library"
 arch=("i686" "x86_64")
 url="https://github.com/y-256/libdivsufsort"
@@ -25,4 +25,4 @@ package() {
     rm -f "${pkgdir}"/usr/lib/*.la
 }
 
-sha256sums=("9164cb6044dcb6e430555721e3318d5a8f38871c2da9fd9256665746a69351e0")
+sha256sums=('9164cb6044dcb6e430555721e3318d5a8f38871c2da9fd9256665746a69351e0')
diff --git a/phylonium/PKGBUILD b/phylonium/PKGBUILD
index cca3c42b0d..f3e1e3f873 100644
--- a/phylonium/PKGBUILD
+++ b/phylonium/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Fabian Klötzl <fabian-aur@kloetzl.info>
 pkgname=phylonium
 pkgver=1.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Fast and Accurate Estimation of Evolutionary Distances"
 url="https://github.com/evolbioinf/phylonium/"
 license=("GPL3") # "custom:ISC"
diff --git a/phyml/PKGBUILD b/phyml/PKGBUILD
index 404388b5ac..65d2810725 100644
--- a/phyml/PKGBUILD
+++ b/phyml/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Mick Elliot <micke at sfu dot ca>
 pkgname=phyml
 pkgver=3.3.20200621
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Builds phylogenies from DNA or protein sequences using a maximum likelihood approach"
 arch=('i686' 'x86_64')
diff --git a/raxml-mpi/PKGBUILD b/raxml-mpi/PKGBUILD
index 72f2bad801..62cda8265e 100644
--- a/raxml-mpi/PKGBUILD
+++ b/raxml-mpi/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=raxml-mpi
 pkgver=8.2.12
-pkgrel=1
+pkgrel=2
 pkgdesc="Randomized Axelerated Maximum Likelihood"
 arch=('x86_64')
 url="http://sco.h-its.org/exelixis/web/software/raxml/"
diff --git a/raxml/PKGBUILD b/raxml/PKGBUILD
index 43ffc1ccf6..705f5a7dab 100644
--- a/raxml/PKGBUILD
+++ b/raxml/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=raxml
 pkgver=8.2.12
-pkgrel=1
+pkgrel=2
 pkgdesc="Randomized Axelerated Maximum Likelihood"
 arch=('x86_64')
 url="http://sco.h-its.org/exelixis/web/software/raxml/"
diff --git a/raxmlgui/PKGBUILD b/raxmlgui/PKGBUILD
index ae11a9f4d0..33698547fd 100644
--- a/raxmlgui/PKGBUILD
+++ b/raxmlgui/PKGBUILD
@@ -2,16 +2,21 @@
 # Contributor: Malacology <guoyizhang at malacology dot com>
 
 pkgname=raxmlgui
-pkgver=2.0.5
-pkgrel=2
+pkgver=2.0.6
+pkgrel=1
 pkgdesc="A new user-friendly program integrating RAxML-NG and ModelTest-NG for cutting-edge phylogenetic analysis"
 arch=('x86_64')
 url="https://antonellilab.github.io/raxmlGUI"
 provides=("raxmlgui")
 license=('AGPL3')
 source=("https://github.com/AntonelliLab/raxmlGUI/releases/download/v${pkgver}/raxmlGUI-${pkgver}.AppImage" "raxmlgui.desktop")
+<<<<<<< HEAD
 sha256sums=('3e67b95551e26b2cc26e9a5f62583a2bec2351b53587d188718dcab8fc588068'
             'a589d49d17a9d07a7b6cf1e41334d5c014a57e1b4faa31f22f106223bb994596')
+=======
+sha256sums=('f2113bb75c5c7c65182ff7e4da5d7ec52c06ed6b0e741bbc8b3dadb716441cdd'
+            '4997996df092faa5b4adf7952083bd93b2667c4b89a2781ac3f02f5c930202f3')
+>>>>>>> 1003a37edc7a5dda07925ace0e75ee8787d731e4
 
 prepare() {
   cd "${srcdir}"