2 files changed, 6 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f61d5c259112..a09a72abb2f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Jun 28 10:36:14 UTC 2016
+# Tue Jun 28 13:12:40 UTC 2016
 pkgbase = gitsome
 	pkgdesc = A Supercharged Git/Shell Autocompleter with GitHub Integration.
 	pkgver = 0.6.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/donnemartin/gitsome
 	arch = any
 	license = APACHE
@@ -20,6 +20,8 @@ pkgbase = gitsome
 	depends = python-docopt
 	depends = python-uritemplate.py
 	depends = python-numpydoc
+	conflicts = xonsh
+	conflicts = python-gitsome
 	source = https://pypi.python.org/packages/30/9a/2ac38108d08869abbcb757f52f28b6730f6cf249b2f13c161783655f1a0f/gitsome-0.6.0.tar.gz
 	md5sums = 66bf9620e442156cbb032851d33b75ed
 
diff --git a/PKGBUILD b/PKGBUILD
index ba65854b08b9..1cc7a3901ead 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,12 @@
 pkgname=('gitsome')
 _module='gitsome'
 pkgver='0.6.0'
-pkgrel=3
+pkgrel=4
 pkgdesc="A Supercharged Git/Shell Autocompleter with GitHub Integration."
 url="https://github.com/donnemartin/gitsome"
 depends=('python' 'python-ply' 'python-prompt_toolkit' 'python-requests' 'python-colorama' 'python-click' 'python-pygments' 'python-feedparser' 'python-pytz' 'python-docopt' 'python-uritemplate.py' 'python-numpydoc')
 makedepends=('python-setuptools')
+conflicts=('xonsh' 'python-gitsome')
 license=('APACHE')
 arch=('any')
 source=("https://pypi.python.org/packages/30/9a/2ac38108d08869abbcb757f52f28b6730f6cf249b2f13c161783655f1a0f/gitsome-${pkgver}.tar.gz")