merge from lee