Add merge tracking to 3.0.x-fixes