partial merge work