The whole plot around the confusion of Mercedes' VW (from the then present with the one from the then future, or from the now past with the now present one) was planned right from the start, just as I drew that particular scene in part 1 at the gas station. I even made a little sketch to tie the two timelines together, unfortunately it's only available in German. Still, you can approximately guess what's going on looking at the letters (which are explained below). And don't forget that we've already met the gas station attendant earlier in this story, albeit not visually.

M = Mercedes
T = Death
H = Harry (the cop)
D = Danny
LD = Little Death
K = VW car
TW = gas station attendant
B = Bonnie

Numbers 1 and 2 next to the letters stand for "from part 1" or "from part 2".

Aside from that: Don't ask me what happened to those gas pumps, because they are the f*cking thinnest gas pumps I have ever seen. I have no clue why I drew them like that, I probably simply didn't care.