package-lock.json merge=ours
package.json merge=ours
