add existing conflict fixed