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