Merge dependency fixes