Got merge work in simple case with new diff code