Fix some mistake of auto-merge