merge files from jz branch