[PATCH] override-a1.txt: rework A1 overrides