Fix merge mistake from sync from origin repository