clamz confilicts f,x
Merge branch 'master' of github.com:pisilinux/PisiLinux