Fix merge issues from previous merge