diff --git a/routes/product.js b/routes/product.js
index bf7560e..d58e61f 100644
--- a/routes/product.js
+++ b/routes/product.js
@@ -2,7 +2,10 @@ const express = require('express');
 const common = require('../lib/common');
 const { restrict, checkAccess } = require('../lib/auth');
 const { indexProducts } = require('../lib/indexing');
+<<<<<<< HEAD
 const { validateJson } = require('../lib/schema');
+=======
+>>>>>>> 0972565124e88e2dc57744e72b8734ffc85d1532
 const colors = require('colors');
 const rimraf = require('rimraf');
 const fs = require('fs');