fix driver program merge conflict