diff --git a/routes/users.js b/routes/users.js
index 623e430..0931119 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -1,9 +1,12 @@
 var express = require('express');
 var router = express.Router();
 
+// hopefuly there will be a merge conflict
+
 /* GET users listing. */
 router.get('/', function(req, res, next) {
   res.send('respond with a resource');
 });
 
 module.exports = router;
+// Merge conflict test