Fix previous merge commit.