fix partial merge