Fix wrong variable reference after rebase conflict.