Fix merge rubbish.