Deps merge fix.