solved merge conflict

app.js

@@ -3,7 +3,7 @@ const MongoStore = require("connect-mongo");
 const session = require("express-session");
 const express = require('express');
 const path = require('path');
-const joi = require('joi'); 
+const joi = require('joi');
 require('dotenv').config();
 
 const app = express();
@@ -23,7 +23,7 @@ app.use(session({
 }));
 
 app.set('view engine', 'ejs');
-app.set('views',path.join(__dirname, 'src/views'));
+app.set('views', path.join(__dirname, 'src/views'));
 app.use(express.urlencoded({ extended: true }));
 app.use("/static", express.static("./src/public"));
 app.use("/images", express.static("./src/public/images"));
@@ -36,7 +36,7 @@ let users;
 let rates;
 async function initDatabase() {
     const db = await connectMongo(mongoURI, database);
-    
+
     // For any collection, init here
     users = await getCollection(db, "users");
     plans = await getCollection(db, "plans");
@@ -61,7 +61,7 @@ app.get('/signup', (req, res) => {
 app.get('/login', (req, res) => {
     if (req.session.authenticated) {
         res.redirect("/home");
-        return res.status(status.Ok);        
+        return res.status(status.Ok);
     }
     res.render('login', { errMessage: req.session.errMessage });
     return res.status(status.Ok);
@@ -87,10 +87,10 @@ initDatabase().then(() => {
     app.get('/*splat', (req, res) => {
         res.send('404 Not Found');
         return res.status(status.NotFound);
-    });    
+    });
 
     // Start app
     app.listen(port, () => {
         console.log(`Server listening on port ${port}`);
-    });    
+    });
 });