Fix rebase conflict.