merge frome zmofei