remove some diff errors