Merge with hope to conflict