Fix previous merge commit