fix merge error and rearrange elements