conflicts pan2 y
