conflicts pan2-beta
conflicts pan2-git
