remove some merge diff remnants