fix merge conflict

Author: benmccann

packages/kit/src/core/build/index.js

@@ -33,12 +33,8 @@ const s = (value) => JSON.stringify(value);
  * @returns {Promise<import('types/internal').BuildData>}
  */
 export async function build(config, { cwd = process.cwd(), runtime = '@sveltejs/kit/ssr' } = {}) {
-<<<<<<< HEAD
 	const raw_build_dir = `${SVELTE_KIT}/node_modules/@sveltejs/kit-app`;
 	const build_dir = path.resolve(cwd, raw_build_dir);
-=======
-	const build_dir = path.resolve(cwd, `${SVELTE_KIT}/node_modules`);
->>>>>>> 14c96c50d322c4454164fc1dc67cf236e09c38b0
 
 	rimraf(build_dir);