2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b16af5f01199..b696dada4d58 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-tensorboardx
 	pkgdesc = Tensorboard for PyTorch
 	pkgver = 1.4
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/lanpa/tensorboardX
 	arch = any
 	license = MIT
@@ -11,6 +11,7 @@ pkgbase = python-tensorboardx
 	depends = python-protobuf
 	depends = python-six
 	optdepends = tensorboard: to visualise TensorBoard data
+	conflicts = python-tensorboard-git
 	source = https://files.pythonhosted.org/packages/source/t/tensorboardX/tensorboardX-1.4.tar.gz
 	sha256sums = bacf2825c8fb9c40bea22c50796fc4afe5bf11ff5f5c3b7ad7c933ad034b6fae
 
diff --git a/PKGBUILD b/PKGBUILD
index 1769b472a8a2..d70c62d2c729 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 _name=tensorboardX
 pkgname=python-tensorboardx
 pkgver=1.4
-pkgrel=4
+pkgrel=5
 pkgdesc="Tensorboard for PyTorch"
 arch=('any')
 url="https://github.com/lanpa/tensorboardX"
@@ -10,6 +10,7 @@ license=('MIT')
 depends=('python-pytorch' 'python-torchvision' 'python-protobuf' 'python-six')
 optdepends=('tensorboard: to visualise TensorBoard data')
 makedepends=('python-setuptools')
+conflicts=('python-tensorboard-git')
 source+=("https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz")
 sha256sums=('bacf2825c8fb9c40bea22c50796fc4afe5bf11ff5f5c3b7ad7c933ad034b6fae')