Some merge/rebase went wrong.