nareshnist
diff --git a/‎.gitattributes
+2-1 b/‎.gitattributes
+2-1
diff --git a/‎.gitconfig
+3 b/‎.gitconfig
+3
@@ -1,4 +1,5 @@
-package-lock.json            -diff -merge
+package-lock.json merge=npm-merge-driver
+npm-shrinkwrap.json merge=npm-merge-driver
 
 elements/*/*.js              -diff -merge
 elements/*/*.js.map          -diff -merge
 
@@ -0,0 +1,3 @@
+[merge "npm-merge-driver"]
+	name = Automatically merge npm lockfiles
+	driver = npx npm-merge-driver merge %A %O %B %P
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[merge "npm-merge-driver"]`
	`2`	`+ name = Automatically merge npm lockfiles`
	`3`	`+ driver = npx npm-merge-driver merge %A %O %B %P`