remove existing conflict git folder