remove some conflict files