Lane to A1 South does not link up at traffic lights

Travelling off the clockwise M25 round the junction heading for the A1 Southbound, the lane marked for the M25 Heathrow lines up with the lane for A1 Southbound after the traffic lights. The result is that traffic heading for the A1 Southbound is now queuing in both the M25 lane and the correct A1 southbound Lane. If there hasn’t already been accidents I suspect it will not be long before there are. Markings showing the the correct flow between the lanes before and after the lights, as it used to be, would make the situation much clearer.