conflicts pan2
conflicts pan2-beta
