Merge Conflicts Again

package.json

@@ -18,12 +18,9 @@
     "cors": "^2.8.5",
     "dotenv": "^8.0.0",
     "express": "^4.17.1",
-<<<<<<< HEAD
     "passport": "^0.4.0",
     "passport-google-oauth20": "^2.0.0",
-=======
     "moment": "^2.24.0",
->>>>>>> 23d37feae9a672a4263def1f857a8f2238386db7
     "pg": "^7.11.0",
     "pg-hstore": "^2.3.3",
     "react": "^16.8.6",

src/backend/server.js

@@ -38,7 +38,6 @@ passport.serializeUser(function(user, done) {
   done(null, user);
 });
 
-<<<<<<< HEAD
 passport.deserializeUser(function(obj, done) {
   done(null, obj);
 });
@@ -111,7 +110,6 @@ app.get('/habits/chat/:habitId', habitController.getMessages, (req, res) => {
 // middleware for creating log
 app.post('/habits/createLog/:id', habitController.createLog, (req, res) => {
   res.status(200).json('habit checked');
-=======
 // Create a *POST* route for url /api/habits/createHabit
 // send data for new habit
 app.post('/api/createHabit', habitController.createHabit, (req, res) => {
@@ -140,7 +138,6 @@ app.post('/api/getHabits', habitController.getHabits, (req, res) => {
 // });
 app.post('/api/login', habitController.loginUser, (req, res) => {
   return res.status(200).json(res.locals.user);
->>>>>>> 23d37feae9a672a4263def1f857a8f2238386db7
 });
 
 // global error handler
@@ -150,13 +147,10 @@ app.use(function(req, res, next) {
   return next(err);
 });
 
-<<<<<<< HEAD
 app.use((err, req, res, next) => {
   res.status(400).json(err.message);
 });
 
-=======
->>>>>>> 23d37feae9a672a4263def1f857a8f2238386db7
 // web socket for chat function
 io.on('connection', socket => {
   // below we listen if our pot is updated

src/frontend/components/habits/HabitContainer.js

@@ -16,13 +16,8 @@ import { bindActionCreators } from 'redux';
 import styled from 'styled-components';
 import HabitDetails from './HabitDetails';
 import HabitLog from './HabitLog';
-<<<<<<< HEAD
-import { toggleHabit, sendMessage } from './actions';
-import Chat from './Chat.js';
-=======
 import { toggleHabit, sendMessage, getHabits } from './actions';
 import Chat from './Chat';
->>>>>>> 23d37feae9a672a4263def1f857a8f2238386db7
 
 class HabitContainer extends Component {
   constructor() {

webpack.config.js

@@ -13,16 +13,12 @@ module.exports = env => {
     devServer: {
       contentBase: './dist',
       proxy: {
-<<<<<<< HEAD
         '/api': 'http://localhost:3000',
         // '/api/auth/google': 'https://localhost:3000/api/auth/google',
       },
       headers: {
         'Access-Control-Allow-Origin': '*',
         'Access-Control-Allow-Headers': '*',
-=======
-        '/api': 'http://localhost:8000',
->>>>>>> 23d37feae9a672a4263def1f857a8f2238386db7
       },
       hot: true,
     },