add conflicts

 Changes to be committed:
	modified:   PKGBUILD
	modified:   ../bash-completion-android/PKGBUILD