partial merge working