Restore the merge strategy to block merge. I think I'd better not touch this part.....