ankit kumar jat ankit-kumar-jat

How to resolve package-lock.json conflicts

It is not possible to resolve conflicts of package-lock.json in GitHub's merge tool and you need to do a manual merge.

Update the master branch with the latest changes:
```
git checkout master
git pull
```
Merge your feature branch into master:

	import { createHash } from "crypto";
	import fs from "fs";
	import fsp from "fs/promises";
	import path from "path";
	import https from "https";
	import { PassThrough } from "stream";
	import type { Readable } from "stream";
	import type { LoaderFunction } from "remix";
	import sharp from "sharp";
	import type { Request as NodeRequest } from "@remix-run/node";