diff --git a/test/upload-download.test.js b/test/upload-download.test.js
index 9e8901a..f538dd7 100644
--- a/test/upload-download.test.js
+++ b/test/upload-download.test.js
@@ -33,7 +33,6 @@ app.post('/custom/upload', function(req, res, next) {
   });
 
 });
->>>>>>> efe4e08... added file field name into getFilename function
 
 // expose a rest api
 app.use(loopback.rest());