diff --git a/src/lib/constants/dev-environment.ts b/src/lib/constants/dev-environment.ts
index a4c0d4cdb7..a7d5d1e6db 100644
--- a/src/lib/constants/dev-environment.ts
+++ b/src/lib/constants/dev-environment.ts
@@ -47,7 +47,10 @@ export const DEV_ENVIRONMENT_PHP_VERSIONS: Record< string, PhpImage > = {
 		image: 'ghcr.io/automattic/vip-container-images/php-fpm:8.0',
 		label: '8.0 (EOL soon)',
 	},
-	7.4: { image: 'ghcr.io/automattic/vip-container-images/php-fpm:7.4', label: '7.4 (EOL; not supported)' },
+	7.4: {
+		image: 'ghcr.io/automattic/vip-container-images/php-fpm:7.4',
+		label: '7.4 (EOL; not supported)',
+	},
 } as const;
 
 export const DEV_ENVIRONMENT_VERSION = '2.0.0';
diff --git a/src/lib/dev-environment/dev-environment-core.ts b/src/lib/dev-environment/dev-environment-core.ts
index 13698e228f..b4ea66f0a7 100644
--- a/src/lib/dev-environment/dev-environment-core.ts
+++ b/src/lib/dev-environment/dev-environment-core.ts
@@ -197,11 +197,7 @@ function preProcessInstanceData( instanceData: InstanceData ): InstanceData {
 
 	newInstanceData.php =
 		instanceData.php ||
-<<<<<<< HEAD
-		( DEV_ENVIRONMENT_PHP_VERSIONS[ Object.keys( DEV_ENVIRONMENT_PHP_VERSIONS )[ 0 ] ] as string );
-=======
 		DEV_ENVIRONMENT_PHP_VERSIONS[ Object.keys( DEV_ENVIRONMENT_PHP_VERSIONS )[ 0 ] ].image;
->>>>>>> 5d41aa3a (feat(dev-env): add PHP 8.3 image)
 	if ( newInstanceData.php.startsWith( 'image:' ) ) {
 		newInstanceData.php = newInstanceData.php.slice( 'image:'.length );
 	}