fixed offset issue
fixed merge issue and offset issue