Fix conflict between pan and drill-across