diff --git a/.gitignore b/.gitignore
index 1be42c5..6ca1b17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,4 @@
 node_modules/
-<<<<<<< HEAD
-.env
-=======
 .env
 build/
 .nyc_output/
->>>>>>> main
diff --git a/.nyc_output/processinfo/index.json b/.nyc_output/processinfo/index.json
deleted file mode 100644
index 481d084..0000000
--- a/.nyc_output/processinfo/index.json
+++ /dev/null
@@ -1 +0,0 @@
-{"processes":{"013f7766-5b46-4707-9549-1c33bee6fe3e":{"parent":null,"children":["82a538a8-9168-47de-9625-54043fa4e539"]},"82a538a8-9168-47de-9625-54043fa4e539":{"parent":"013f7766-5b46-4707-9549-1c33bee6fe3e","children":[]}},"files":{"/Users/jacoblurie/Git/College/ChangePlusPlus/miracleflightsbackend/src/tests/Examples.tests.ts":["013f7766-5b46-4707-9549-1c33bee6fe3e"],"/Users/jacoblurie/Git/College/ChangePlusPlus/miracleflightsbackend/src/config/server.config.ts":["013f7766-5b46-4707-9549-1c33bee6fe3e"],"/Users/jacoblurie/Git/College/ChangePlusPlus/miracleflightsbackend/src/routes/routes.ts":["013f7766-5b46-4707-9549-1c33bee6fe3e"],"/Users/jacoblurie/Git/College/ChangePlusPlus/miracleflightsbackend/src/controllers/Passenger.controller.ts":["013f7766-5b46-4707-9549-1c33bee6fe3e"],"/Users/jacoblurie/Git/College/ChangePlusPlus/miracleflightsbackend/src/util/logger.ts":["013f7766-5b46-4707-9549-1c33bee6fe3e"],"/Users/jacoblurie/Git/College/ChangePlusPlus/miracleflightsbackend/src/data/test-data.ts":["013f7766-5b46-4707-9549-1c33bee6fe3e"],"/Users/jacoblurie/Git/College/ChangePlusPlus/miracleflightsbackend/src/data/constants.ts":["013f7766-5b46-4707-9549-1c33bee6fe3e"],"/Users/jacoblurie/Git/College/ChangePlusPlus/miracleflightsbackend/src/util/trim.ts":["013f7766-5b46-4707-9549-1c33bee6fe3e"],"/Users/jacoblurie/Git/College/ChangePlusPlus/miracleflightsbackend/src/controllers/FlightRequest.controller.ts":["013f7766-5b46-4707-9549-1c33bee6fe3e"],"/Users/jacoblurie/Git/College/ChangePlusPlus/miracleflightsbackend/src/controllers/TestControllers/queryParameterExample.ts":["013f7766-5b46-4707-9549-1c33bee6fe3e"],"/Users/jacoblurie/Git/College/ChangePlusPlus/miracleflightsbackend/src/controllers/TestControllers/pathParameterExample.ts":["013f7766-5b46-4707-9549-1c33bee6fe3e"],"/Users/jacoblurie/Git/College/ChangePlusPlus/miracleflightsbackend/src/controllers/TestControllers/bodyParameterExample.ts":["013f7766-5b46-4707-9549-1c33bee6fe3e"],"/Users/jacoblurie/Git/College/ChangePlusPlus/miracleflightsbackend/src/controllers/TestControllers/retrievePassengers.ts":["013f7766-5b46-4707-9549-1c33bee6fe3e"],"/Users/jacoblurie/Git/College/ChangePlusPlus/miracleflightsbackend/src/controllers/User.controller.ts":["013f7766-5b46-4707-9549-1c33bee6fe3e"],"/Users/jacoblurie/Git/College/ChangePlusPlus/miracleflightsbackend/src/tests/FlightRequest.tests.ts":["013f7766-5b46-4707-9549-1c33bee6fe3e"],"/Users/jacoblurie/Git/College/ChangePlusPlus/miracleflightsbackend/src/tests/Passenger.tests.ts":["013f7766-5b46-4707-9549-1c33bee6fe3e"],"/Users/jacoblurie/Git/College/ChangePlusPlus/miracleflightsbackend/src/tests/Trimming.tests.ts":["013f7766-5b46-4707-9549-1c33bee6fe3e"],"/Users/jacoblurie/Git/College/ChangePlusPlus/miracleflightsbackend/src/tests/User.tests.ts":["013f7766-5b46-4707-9549-1c33bee6fe3e"]},"externalIds":{}}
\ No newline at end of file