diff --git a/src/chat/src/run.ts b/src/chat/src/run.ts
index c96aed0..3c59d5d 100644
--- a/src/chat/src/run.ts
+++ b/src/chat/src/run.ts
@@ -4,29 +4,11 @@ import fastify, { FastifyInstance } from 'fastify';
 import app from './app';
 
 const start = async () => {
-<<<<<<< HEAD
 	const f: FastifyInstance = fastify({ logger: { level: 'info' } });
 	process.on('SIGTERM', () => {
 		f.log.warn('Requested to shutdown');
 		process.exit(134);
 	});
-=======
-	const envToLogger = {
-		development: {
-			transport: {
-				target: 'pino-pretty',
-				options: {
-					translateTime: 'HH:MM:ss Z',
-					ignore: 'pid,hostname',
-				},
-			},
-		},
-		production: true,
-		test: false,
-	};
-
-	const f: FastifyInstance = fastify({ logger: envToLogger.development });
->>>>>>> refs/remotes/origin/nigel/functionBlockMessage
 	try {
 		await f.register(app, {});
 		await f.listen({ port: 80, host: '0.0.0.0' });