diff --git a/backend/app.js b/backend/app.js
index 0d46f30f1ff91e4d0a79ca9f2b1a72bdfc2def01..42af07e2d3bf589b19b0111811338b4624d51084 100644
--- a/backend/app.js
+++ b/backend/app.js
@@ -35,12 +35,12 @@ app.use(cookieParser());
 app.use(express.static(path.join(__dirname, "public")));
 
 //app.use('/', indexRouter);
-<<<<<<< HEAD
+
 app.use("/api/books", bookRouter);
 app.use("/api/login", loginRouter);
-=======
+
 app.use('/api/books', bookRouter);
->>>>>>> master
+
 //app.use('/users', usersRouter);
 
 // catch 404 and forward to error handler