merge remote ... some but not all