More deps to solve your conflicts

Another batch, fixes the present problem.