ZGV conflict fix