partial merge take 2