diff --git a/.clang-format b/.clang-format
index 039810c..585ff9e 100644
--- a/.clang-format
+++ b/.clang-format
@@ -70,7 +70,23 @@ SpacesInCStyleCastParentheses: false
 SpacesInContainerLiterals: false
 SpacesInParentheses: true
 SpacesInSquareBrackets: false
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
 Standard: Cpp11
+=======
+Standard: Cpp17
+>>>>>>> template/carbonengine/resources-updates
+=======
+Standard: Cpp17
+>>>>>>> template/carbonengine/resources-updates
+=======
+Standard: Cpp17
+>>>>>>> template/carbonengine/resources-updates
+=======
+Standard: Cpp17
+>>>>>>> template/carbonengine/resources-updates
 TabWidth: 4
 UseTab: ForContinuationAndIndentation
 ---
@@ -146,7 +162,35 @@ SpacesInCStyleCastParentheses: false
 SpacesInContainerLiterals: false
 SpacesInParentheses: true
 SpacesInSquareBrackets: false
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
 Standard: Cpp11
 TabWidth: 4
 UseTab: ForContinuationAndIndentation
 ...
+=======
+Standard: Cpp17
+TabWidth: 4
+UseTab: ForContinuationAndIndentation
+...
+>>>>>>> template/carbonengine/resources-updates
+=======
+Standard: Cpp17
+TabWidth: 4
+UseTab: ForContinuationAndIndentation
+...
+>>>>>>> template/carbonengine/resources-updates
+=======
+Standard: Cpp17
+TabWidth: 4
+UseTab: ForContinuationAndIndentation
+...
+>>>>>>> template/carbonengine/resources-updates
+=======
+Standard: Cpp17
+TabWidth: 4
+UseTab: ForContinuationAndIndentation
+...
+>>>>>>> template/carbonengine/resources-updates
diff --git a/.editorconfig b/.editorconfig
index de4c453..888a63f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,11 +1,31 @@
 [*]
 charset = utf-8
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
 end_of_line = crlf
+=======
+end_of_line = lf
+>>>>>>> template/carbonengine/resources-updates
+=======
+end_of_line = lf
+>>>>>>> template/carbonengine/resources-updates
+=======
+end_of_line = lf
+>>>>>>> template/carbonengine/resources-updates
+=======
+end_of_line = lf
+>>>>>>> template/carbonengine/resources-updates
 indent_size = 4
 indent_style = space
 insert_final_newline = false
 max_line_length = 120
 tab_width = 4
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
 ij_continuation_indent_size = 8
 ij_formatter_off_tag = @formatter:off
 ij_formatter_on_tag = @formatter:on
@@ -946,3 +966,40 @@ ij_python_wrap_long_lines = false
 
 [{*.toml,Cargo.lock,Cargo.toml.orig,Gopkg.lock,Pipfile,poetry.lock}]
 ij_toml_keep_indents_on_empty_lines = false
+=======
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+trim_trailing_whitespace = true
+
+[{*.yaml,*.yml,.clang-format,.clang-tidy,_clang-format}]
+# In yaml, a two-space indent is used by default in many of the solutions we integrate with.
+# Examples are GitHub Actions and Kubernetes
+indent_size = 2
+
+[{*.h,*.hpp,*.hxx,*.c,*.cpp,*.cxx}]
+# .clang-format should take precedence, but for editors which do not do that we're adding those settings here, too.
+indent_style = tab
+
+[*.red]
+# Those are yaml files, but do use a 4 space indent
+indent_size = 4
+
+[{*.markdown,*.md}]
+# In markdown a [double whitespace at the end of a line acts as a line break](https://www.markdownguide.org/basic-syntax/#line-breaks).
+# Even though it's controversial to use it for that purpose (there are alternatives like using the `<br />` html tag),
+# let's not break it accidentally in files that already use the double whitespace.
+trim_trailing_whitespace = false
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
diff --git a/.gitignore b/.gitignore
index 25185dc..62ae323 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,22 @@
 *.pch
 
 # Compiled Dynamic libraries
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+binaryCache/
+>>>>>>> template/carbonengine/resources-updates
+=======
+binaryCache/
+>>>>>>> template/carbonengine/resources-updates
+=======
+binaryCache/
+>>>>>>> template/carbonengine/resources-updates
+=======
+binaryCache/
+>>>>>>> template/carbonengine/resources-updates
 *.so
 *.dylib
 *.dll
@@ -29,6 +45,10 @@ __pycache__/
 # User generated local cmake configuration
 CMakeUserPresets.json
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
 
 ### IDE ###
 # User generated local IDE configuration
@@ -37,3 +57,19 @@ CMakeUserPresets.json
 ### VCPKG ###
 # Temporary measure which fixes build agent issue
 vcpkg_registry_cache/
+=======
+.cmake-build*
+cmake-build*
+>>>>>>> template/carbonengine/resources-updates
+=======
+.cmake-build*
+cmake-build*
+>>>>>>> template/carbonengine/resources-updates
+=======
+.cmake-build*
+cmake-build*
+>>>>>>> template/carbonengine/resources-updates
+=======
+.cmake-build*
+cmake-build*
+>>>>>>> template/carbonengine/resources-updates
diff --git a/.teamcity/MacOS/Project.kt b/.teamcity/MacOS/Project.kt
index b63c334..c40b33c 100644
--- a/.teamcity/MacOS/Project.kt
+++ b/.teamcity/MacOS/Project.kt
@@ -51,7 +51,19 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag
     id(buildName.toId())
     name = buildName
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
     artifactRules = "%env.CMAKE_INSTALL_PREFIX%"
+=======
+    artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip"
+>>>>>>> template/carbonengine/resources-updates
+=======
+    artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip"
+>>>>>>> template/carbonengine/resources-updates
+=======
+    artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip"
+>>>>>>> template/carbonengine/resources-updates
 
     params {
         param("env.SENTRY_CLI_DEBUG_SYMBOL_TYPE", "dsym")
@@ -73,7 +85,23 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag
         param("env.VCPKG_BINARY_SOURCES", "clear;x-aws,s3://vcpkg-binary-cache-static/cache/,readwrite")
         param("env.X_VCPKG_REGISTRIES_CACHE", "%teamcity.build.checkoutDir%/%github_checkout_folder%/regcache")
         param("env.CMAKE_BUILD_PARALLEL_LEVEL", "8")
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
         param("env.CTEST_PARALLEL_LEVEL", "1")
+=======
+        param("env.CTEST_PARALLEL_LEVEL", "8")
+>>>>>>> template/carbonengine/resources-updates
+=======
+        param("env.CTEST_PARALLEL_LEVEL", "8")
+>>>>>>> template/carbonengine/resources-updates
+=======
+        param("env.CTEST_PARALLEL_LEVEL", "8")
+>>>>>>> template/carbonengine/resources-updates
+=======
+        param("env.CTEST_PARALLEL_LEVEL", "8")
+>>>>>>> template/carbonengine/resources-updates
     }
 
 
@@ -104,7 +132,11 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag
         exec {
             name = "Configure"
             path = "cmake"
+<<<<<<< HEAD
             arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DBUILD_CLI=ON -DBUILD_TESTING=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees"
+=======
+            arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees"
+>>>>>>> template/carbonengine/resources-updates
         }
         exec {
             name = "Build"
diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt
index 8b60709..8604b46 100644
--- a/.teamcity/Windows/Project.kt
+++ b/.teamcity/Windows/Project.kt
@@ -20,12 +20,19 @@ import jetbrains.buildServer.configs.kotlin.triggers.vcs
 import jetbrains.buildServer.configs.kotlin.vcs.GitVcsRoot
 import jetbrains.buildServer.configs.kotlin.buildFeatures.provideAwsCredentials
 
+<<<<<<< HEAD
 val BuildParameters = "-arch=x64 -vcvars_ver=14.51"
 val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug",BuildParameters)
 val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal",BuildParameters)
 val TrinityDev = CarbonBuildWindows("TrinityDev Windows", "TrinityDev", "x64-windows-trinitydev",BuildParameters)
 val Release = CarbonBuildWindows("Release Windows", "Release", "x64-windows-release",BuildParameters)
 val ReleaseDevFeatures = CarbonBuildWindows("Release Windows with Dev Features", "Release", "x64-windows-release-with-dev-features",BuildParameters)
+=======
+val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug")
+val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal")
+val TrinityDev = CarbonBuildWindows("TrinityDev Windows", "TrinityDev", "x64-windows-trinitydev")
+val Release = CarbonBuildWindows("Release Windows", "Release", "x64-windows-release")
+>>>>>>> template/carbonengine/resources-updates
 
 object Project : Project({
     id("Windows")
@@ -35,7 +42,17 @@ object Project : Project({
     buildType(Internal)
     buildType(TrinityDev)
     buildType(Release)
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
     buildType(ReleaseDevFeatures)
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
 })
 
 
@@ -43,13 +60,36 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String,
     id(buildName.toId())
     this.name = buildName
 
+<<<<<<< HEAD
+<<<<<<< HEAD
     artifactRules = "%env.CMAKE_INSTALL_PREFIX%"
+=======
+    artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip"
+>>>>>>> template/carbonengine/resources-updates
+=======
+    artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip"
+>>>>>>> template/carbonengine/resources-updates
+=======
+})
+
+
+class CarbonBuildWindows(buildName: String, configType: String, preset: String) : BuildType({
+    id(buildName.toId())
+    this.name = buildName
+
+    artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip"
+>>>>>>> template/carbonengine/resources-updates
 
     params {
         param("env.GIT_TAG_HASH_OVERRIDE", "")
         param("github_checkout_folder", "github")
         param("env.CTEST_JUNIT_OUTPUT_FILE", "ctest_results.xml")
+<<<<<<< HEAD
         param("VS_DEV_BAT_SWITCHES", vsDevBatSwitches)
+=======
+        select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.",
+                options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143"))
+>>>>>>> template/carbonengine/resources-updates
         param("env.CMAKE_BUILD_TARGETS", "all")
         param("env.CMAKE_INSTALL_PREFIX", ".build-artifact")
         param("env.CMAKE_CONFIG_TYPE", configType)
@@ -63,7 +103,23 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String,
         param("env.VCPKG_BINARY_SOURCES", "clear;x-aws,s3://vcpkg-binary-cache-static/cache/,readwrite")
         param("env.X_VCPKG_REGISTRIES_CACHE", "%teamcity.build.checkoutDir%/%github_checkout_folder%/regcache")
         param("env.CMAKE_BUILD_PARALLEL_LEVEL", "8")
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
         param("env.CTEST_PARALLEL_LEVEL", "1")
+=======
+        param("env.CTEST_PARALLEL_LEVEL", "8")
+>>>>>>> template/carbonengine/resources-updates
+=======
+        param("env.CTEST_PARALLEL_LEVEL", "8")
+>>>>>>> template/carbonengine/resources-updates
+=======
+        param("env.CTEST_PARALLEL_LEVEL", "8")
+>>>>>>> template/carbonengine/resources-updates
+=======
+        param("env.CTEST_PARALLEL_LEVEL", "8")
+>>>>>>> template/carbonengine/resources-updates
     }
 
     vcs {
@@ -91,7 +147,11 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String,
             scriptContent = """
                 REM unfortunately ninja does not find the VS environment otherwise
                 REM NB: the exported PATH also contains the location where we installed sentry-cli, e.g. teamcity.agent.work.dir
+<<<<<<< HEAD
                 call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES%
+=======
+                call "%env.VSDEV_BAT_PATH%" -arch=x64
+>>>>>>> template/carbonengine/resources-updates
                 echo ##teamcity[setParameter name='env.INCLUDE' value='%%INCLUDE%%']
                 echo ##teamcity[setParameter name='env.LIB' value='%%LIB%%']
                 echo ##teamcity[setParameter name='env.LIBPATH' value='%%LIBPATH%%']
@@ -101,7 +161,11 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String,
         exec {
             name = "Configure"
             path = "cmake"
+<<<<<<< HEAD
             arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DBUILD_CLI=ON -DBUILD_TESTING=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees"
+=======
+            arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees"
+>>>>>>> template/carbonengine/resources-updates
         }
         exec {
             name = "Build"
diff --git a/.teamcity/_Self.kt/Project.kt b/.teamcity/_Self.kt/Project.kt
index 6780beb..4d12cab 100644
--- a/.teamcity/_Self.kt/Project.kt
+++ b/.teamcity/_Self.kt/Project.kt
@@ -8,7 +8,23 @@ import jetbrains.buildServer.configs.kotlin.vcs.GitVcsRoot
 
 object Project : Project({
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
     description = "Build / Publish pipeline for https://github.com/carbonengine/resources"
+=======
+    description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template"
+>>>>>>> template/carbonengine/resources-updates
+=======
+    description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template"
+>>>>>>> template/carbonengine/resources-updates
+=======
+    description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template"
+>>>>>>> template/carbonengine/resources-updates
+=======
+    description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template"
+>>>>>>> template/carbonengine/resources-updates
 
     params {
         /* before changing carbon_ref, make sure to disable automatic settings synchronization on teamcity */
diff --git a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt
index 034dbb1..f29e26a 100644
--- a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt
+++ b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt
@@ -20,7 +20,23 @@ class UniversalBuild() : BuildType({
         param("x64-bin-path", "bin/macOS/x64")
         param("arm64-bin-path", "bin/macOS/arm64")
         text("file-matchers",
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
             "-m 'resources:%system.teamcity.build.workingDir%/bin' -m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'",
+=======
+            "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'",
+>>>>>>> template/carbonengine/resources-updates
+=======
+            "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'",
+>>>>>>> template/carbonengine/resources-updates
+=======
+            "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'",
+>>>>>>> template/carbonengine/resources-updates
+=======
+            "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'",
+>>>>>>> template/carbonengine/resources-updates
             label = "lipo-build matchers",
             description = """
             -m '*.so:lib' to tell the tool to lipo together .so files and output the fat binaries to lib/.
@@ -30,7 +46,15 @@ class UniversalBuild() : BuildType({
         )
     }
 
+<<<<<<< HEAD
+<<<<<<< HEAD
     artifactRules = "%universal-output-dir%"
+=======
+    artifactRules = "%universal-output-dir% => artifact.zip"
+>>>>>>> template/carbonengine/resources-updates
+=======
+    artifactRules = "%universal-output-dir% => artifact.zip"
+>>>>>>> template/carbonengine/resources-updates
 
     vcs {
         root(AbsoluteId("CarbonPipelineTools"), "+:carbon/.=>carbon")
@@ -86,7 +110,19 @@ class UniversalBuild() : BuildType({
             }
 
             artifacts {
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
                 artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64"
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64"
+>>>>>>> template/carbonengine/resources-updates
             }
         }
         dependency(MacOS.x64_Debug) {
@@ -95,7 +131,19 @@ class UniversalBuild() : BuildType({
             }
 
             artifacts {
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
                 artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64"
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64"
+>>>>>>> template/carbonengine/resources-updates
             }
         }
 
@@ -105,7 +153,19 @@ class UniversalBuild() : BuildType({
             }
 
             artifacts {
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
                 artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64"
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64"
+>>>>>>> template/carbonengine/resources-updates
             }
         }
         dependency(MacOS.x64_Release) {
@@ -114,7 +174,19 @@ class UniversalBuild() : BuildType({
             }
 
             artifacts {
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
                 artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64"
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64"
+>>>>>>> template/carbonengine/resources-updates
             }
         }
 
@@ -124,7 +196,19 @@ class UniversalBuild() : BuildType({
             }
 
             artifacts {
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
                 artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64"
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64"
+>>>>>>> template/carbonengine/resources-updates
             }
         }
         dependency(MacOS.x64_Internal) {
@@ -133,7 +217,19 @@ class UniversalBuild() : BuildType({
             }
 
             artifacts {
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
                 artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64"
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64"
+>>>>>>> template/carbonengine/resources-updates
             }
         }
 
@@ -143,7 +239,19 @@ class UniversalBuild() : BuildType({
             }
 
             artifacts {
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
                 artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64"
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64"
+>>>>>>> template/carbonengine/resources-updates
             }
         }
         dependency(MacOS.x64_TrinityDev) {
@@ -152,7 +260,19 @@ class UniversalBuild() : BuildType({
             }
 
             artifacts {
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
                 artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64"
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64"
+>>>>>>> template/carbonengine/resources-updates
             }
         }
     }
diff --git a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt
index 05f72b9..7fe2e07 100644
--- a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt
+++ b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt
@@ -27,7 +27,23 @@ class Publish(perforce_publish_path: String) : BuildType({
         param("env.TC_BUILD_URL", "%teamcity.serverUrl%/viewLog.html?buildId=%teamcity.build.id%")
         text("eve_branch_shortname", "", label = "Branch Name", description = """The name of the branch, for example MAINLINE""", display = ParameterDisplay.PROMPT, allowEmpty = false)
         param("env.TC_BUILDID", "%teamcity.build.id%")
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
         param("env.TC_BUILD_NUMBER", "Carbon Resources #%build.number%")
+=======
+        param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%")
+>>>>>>> template/carbonengine/resources-updates
+=======
+        param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%")
+>>>>>>> template/carbonengine/resources-updates
+=======
+        param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%")
+>>>>>>> template/carbonengine/resources-updates
+=======
+        param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%")
+>>>>>>> template/carbonengine/resources-updates
         param("env.P4PORT", "p4is.ccp.ad.local:1666")
         param("env.TC_EVE_BRANCH_SHORTNAME", "%eve_branch_shortname%")
         param("env.TC_EVE_PROJECT", "%project%")
@@ -208,7 +224,19 @@ class Publish(perforce_publish_path: String) : BuildType({
             }
 
             artifacts {
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
                 artifactRules = "**/*=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}"
+=======
+                artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}"
+>>>>>>> template/carbonengine/resources-updates
             }
         }
         dependency(Windows.Debug) {
@@ -217,7 +245,19 @@ class Publish(perforce_publish_path: String) : BuildType({
             }
 
             artifacts {
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
                 artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}"
+=======
+                artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}"
+>>>>>>> template/carbonengine/resources-updates
             }
         }
         dependency(Windows.Internal) {
@@ -226,7 +266,19 @@ class Publish(perforce_publish_path: String) : BuildType({
             }
 
             artifacts {
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
                 artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}"
+=======
+                artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}"
+>>>>>>> template/carbonengine/resources-updates
             }
         }
         dependency(Windows.Release) {
@@ -235,7 +287,19 @@ class Publish(perforce_publish_path: String) : BuildType({
             }
 
             artifacts {
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
                 artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}"
+=======
+                artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}"
+>>>>>>> template/carbonengine/resources-updates
             }
         }
         dependency(Windows.TrinityDev) {
@@ -244,7 +308,19 @@ class Publish(perforce_publish_path: String) : BuildType({
             }
 
             artifacts {
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
                 artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}"
+=======
+                artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}"
+>>>>>>> template/carbonengine/resources-updates
+=======
+                artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}"
+>>>>>>> template/carbonengine/resources-updates
             }
         }
         artifacts(AbsoluteId("Infrastructure_MetaTeamCity_Tools_TeamcityChanges")) {
@@ -259,4 +335,20 @@ class Publish(perforce_publish_path: String) : BuildType({
     }
 })
 
-val PublishToPerforce = Publish("vendor/github.com/carbonengine/resources")
\ No newline at end of file
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+val PublishToPerforce = Publish("vendor/github.com/carbonengine/resources")
+=======
+val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template")
+>>>>>>> template/carbonengine/resources-updates
+=======
+val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template")
+>>>>>>> template/carbonengine/resources-updates
+=======
+val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template")
+>>>>>>> template/carbonengine/resources-updates
+=======
+val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template")
+>>>>>>> template/carbonengine/resources-updates
diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml
index a67ddd6..e15827e 100644
--- a/.teamcity/pom.xml
+++ b/.teamcity/pom.xml
@@ -1,9 +1,33 @@
 <?xml version="1.0"?>
 <project>
   <modelVersion>4.0.0</modelVersion>
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
   <name>Carbon Resources Config DSL Script</name>
   <groupId>Carbon_Resources</groupId>
   <artifactId>Carbon_Resources_dsl</artifactId>
+=======
+  <name>Carbon Template Config DSL Script</name>
+  <groupId>Carbon_Template</groupId>
+  <artifactId>Carbon_Template_dsl</artifactId>
+>>>>>>> template/carbonengine/resources-updates
+=======
+  <name>Carbon Template Config DSL Script</name>
+  <groupId>Carbon_Template</groupId>
+  <artifactId>Carbon_Template_dsl</artifactId>
+>>>>>>> template/carbonengine/resources-updates
+=======
+  <name>Carbon Template Config DSL Script</name>
+  <groupId>Carbon_Template</groupId>
+  <artifactId>Carbon_Template_dsl</artifactId>
+>>>>>>> template/carbonengine/resources-updates
+=======
+  <name>Carbon Template Config DSL Script</name>
+  <groupId>Carbon_Template</groupId>
+  <artifactId>Carbon_Template_dsl</artifactId>
+>>>>>>> template/carbonengine/resources-updates
   <version>1.0-SNAPSHOT</version>
 
   <parent>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 956bc74..8cd138b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
 # Copyright © 2025 CCP ehf.
 
 cmake_minimum_required(VERSION 3.31.1)
@@ -97,11 +101,38 @@ target_include_directories(resources
 )
 
 get_target_property(_SOURCES resources SOURCES)
+=======
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+cmake_minimum_required(VERSION 3.16)
+project(CarbonTemplateProject VERSION 1.0.0)
+
+include(cmake/CcpBuildConfigurations.cmake)
+include(cmake/CcpTargetConfigurations.cmake)
+
+ccp_add_library(target_name SHARED)
+
+get_target_property(_SOURCES target_name SOURCES)
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
 source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}"
         PREFIX "Sources"
         FILES ${_SOURCES}
 )
 
+<<<<<<< HEAD
 if(BUILD_CLI)
     add_subdirectory(cli)
 endif()
@@ -125,6 +156,52 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
         set(SPHINX_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/doc/source)
         set(SPHINX_BUILD ${CMAKE_CURRENT_BINARY_DIR}/doc/build)
 
+=======
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+set_target_properties(target_name PROPERTIES OUTPUT_NAME "_target_name")
+
+target_include_directories(target_name
+        PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:include>
+)
+
+# Provide an install target if this is the top level project only
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+    # Determine if/when to generate/build documentation. The rules are as follows:
+    # - If running locally - Build documentation is OFF by default
+    # - If running on a build agent (TeamCity) - Build documentation is ON by default
+    # - If -DBUILD_DOCUMENTATION=ON/OFF flag is explicitly set, use it.
+    set(BUILD_DOCUMENTATION_DEFAULT_FLAG OFF)
+>>>>>>> template/carbonengine/resources-updates
+    if(DEFINED ENV{TEAMCITY_VERSION})
+        set(BUILD_DOCUMENTATION_DEFAULT_FLAG ON)
+    endif()
+    message(STATUS "Document generation settings: default=${BUILD_DOCUMENTATION_DEFAULT_FLAG}, option BUILD_DOCUMENTATION=${BUILD_DOCUMENTATION}")
+    option(BUILD_DOCUMENTATION "Build Documentation" ${BUILD_DOCUMENTATION_DEFAULT_FLAG})
+
+    if(BUILD_DOCUMENTATION)
+        # Set up sphinx build for Python autodoc comments.
+        set(SPHINX_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/doc/source)
+        set(SPHINX_BUILD ${CMAKE_CURRENT_BINARY_DIR}/doc/build)
+
+        find_package(Python3 COMPONENTS Interpreter REQUIRED)
+        include(cmake/CcpDocsGenerator.cmake)
+
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
         create_carbon_docs_sphinx_target(
                 PYTHON_EXE ${Python3_EXECUTABLE}
                 VENV_NAME docs_generation_venv
@@ -137,6 +214,10 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
                 INSTALL_DESTINATION documentation
         )
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
         # Ensure that resources is built before Spinx target
         add_dependencies(Sphinx resources)
     endif ()
@@ -190,3 +271,75 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     endif()
 
 endif ()
+=======
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+        add_dependencies(Sphinx target_name)
+    endif()
+
+
+    option(INSTALL_TO_MONOLITH "Install this package to a perforce branch vendor folder - provided for backwards compatability" OFF)
+    if (INSTALL_TO_MONOLITH)
+        include(cmake/CcpMonolithVendorConfig.cmake)
+        include(cmake/CcpPackageConfigHelpers.cmake)
+
+        # Install rule to ensure that our runtime and linker files are in the expected, platform-specific folders
+        install(
+                TARGETS target_name
+                EXPORT package_nameTarget
+                CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES}
+                LIBRARY DESTINATION ${CCP_VENDOR_LIB_PATH}
+                ARCHIVE DESTINATION ${CCP_VENDOR_LIB_PATH}
+                RUNTIME DESTINATION ${CCP_VENDOR_BIN_PATH}
+        )
+
+        # Generate target configuration for the monolith
+        configure_ccp_vendor_config_file(
+                TARGET target_name
+                DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/package_nameConfig.cmake"
+                DEPENDENCIES ""
+        )
+        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/package_nameConfig.cmake DESTINATION .)
+        install(DIRECTORY python DESTINATION . FILES_MATCHING PATTERN "*.py")
+    else ()
+        # Install rule for available public headers
+        install(
+                TARGETS target_name
+                EXPORT package_nameTarget
+                CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES}
+                DESTINATION ${CMAKE_INSTALL_PREFIX}/share/package_name
+                ARCHIVE DESTINATION lib
+                LIBRARY DESTINATION lib
+                RUNTIME DESTINATION bin
+        )
+
+        install(EXPORT package_nameTarget
+                DESTINATION share/package_name
+                FILE package_name.cmake
+        )
+
+        install(
+                FILES package_nameConfig.cmake
+                DESTINATION ${CMAKE_INSTALL_PREFIX}/share/package_name)
+    endif()
+
+    install(DIRECTORY include DESTINATION . FILES_MATCHING PATTERN "*.h")
+
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+endif()
+>>>>>>> template/carbonengine/resources-updates
+=======
+endif()
+>>>>>>> template/carbonengine/resources-updates
+=======
+endif()
+>>>>>>> template/carbonengine/resources-updates
+=======
+endif()
+>>>>>>> template/carbonengine/resources-updates
diff --git a/CMakePresets.json b/CMakePresets.json
index 77472d7..09e33db 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -12,7 +12,13 @@
       "binaryDir": "${sourceDir}/.cmake-build-${presetName}",
       "cacheVariables": {
         "VCPKG_USE_HOST_TOOLS": "ON",
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
         "CMAKE_COMPILE_WARNING_AS_ERROR": "ON",
+=======
+>>>>>>> template/carbonengine/resources-updates
         "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/triplets"
       },
       "environment": {
@@ -44,7 +50,11 @@
       "name": "x64-windows",
       "inherits": "windows",
       "cacheVariables": {
+<<<<<<< HEAD
         "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-145-carbon.cmake"
+=======
+        "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake"
+>>>>>>> template/carbonengine/resources-updates
       },
       "hidden": true
     },
@@ -66,14 +76,22 @@
       },
       "hidden": true
     },
+<<<<<<< HEAD
 
+=======
+>>>>>>> template/carbonengine/resources-updates
     {
       "name": "x64-windows-internal",
       "inherits": "x64-windows",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Internal",
+<<<<<<< HEAD
         "VCPKG_TARGET_TRIPLET": "x64-windows-145-internal",
         "VCPKG_HOST_TRIPLET": "x64-windows-145-internal"
+=======
+        "VCPKG_TARGET_TRIPLET": "x64-windows-internal",
+        "VCPKG_HOST_TRIPLET": "x64-windows-internal"
+>>>>>>> template/carbonengine/resources-updates
       }
     },
     {
@@ -81,8 +99,13 @@
       "inherits": "x64-windows",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
+<<<<<<< HEAD
         "VCPKG_TARGET_TRIPLET": "x64-windows-145-release",
         "VCPKG_HOST_TRIPLET": "x64-windows-145-release"
+=======
+        "VCPKG_TARGET_TRIPLET": "x64-windows-release",
+        "VCPKG_HOST_TRIPLET": "x64-windows-release"
+>>>>>>> template/carbonengine/resources-updates
       }
     },
     {
@@ -90,8 +113,13 @@
       "inherits": "x64-windows",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
+<<<<<<< HEAD
         "VCPKG_TARGET_TRIPLET": "x64-windows-145-debug",
         "VCPKG_HOST_TRIPLET": "x64-windows-145-debug"
+=======
+        "VCPKG_TARGET_TRIPLET": "x64-windows-debug",
+        "VCPKG_HOST_TRIPLET": "x64-windows-debug"
+>>>>>>> template/carbonengine/resources-updates
       }
     },
     {
@@ -99,11 +127,15 @@
       "inherits": "x64-windows",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "TrinityDev",
+<<<<<<< HEAD
         "VCPKG_TARGET_TRIPLET": "x64-windows-145-trinitydev",
         "VCPKG_HOST_TRIPLET": "x64-windows-145-trinitydev"
       }
     },
     {
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
       "name": "x64-windows-release-with-dev-features",
       "inherits": "x64-windows-release",
       "cacheVariables": {
@@ -111,6 +143,19 @@
       }
     },
     {
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+        "VCPKG_TARGET_TRIPLET": "x64-windows-trinitydev",
+        "VCPKG_HOST_TRIPLET": "x64-windows-trinitydev"
+      }
+    },
+    {
+>>>>>>> template/carbonengine/resources-updates
       "name": "arm64-osx-internal",
       "inherits": "arm64-osx",
       "cacheVariables": {
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 76ca7f5..d488a70 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -74,7 +74,23 @@ PROJECT_ICON           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
 OUTPUT_DIRECTORY       = @CMAKE_CURRENT_BINARY_DIR@/docs/
+=======
+OUTPUT_DIRECTORY       = @DOCUMENTATION_OUT_DIR@
+>>>>>>> template/carbonengine/resources-updates
+=======
+OUTPUT_DIRECTORY       = @DOCUMENTATION_OUT_DIR@
+>>>>>>> template/carbonengine/resources-updates
+=======
+OUTPUT_DIRECTORY       = @DOCUMENTATION_OUT_DIR@
+>>>>>>> template/carbonengine/resources-updates
+=======
+OUTPUT_DIRECTORY       = @DOCUMENTATION_OUT_DIR@
+>>>>>>> template/carbonengine/resources-updates
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
 # sub-directories (in 2 levels) under the output directory of each output format
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 7e65f15..aa4bc76 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -6,8 +6,28 @@
 # -- Project information -----------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
 project = 'resources'
 copyright = 'Copyright © 2025 CCP ehf'
+=======
+project = 'project_name'
+copyright = '2024, CCP Games'
+>>>>>>> template/carbonengine/resources-updates
+=======
+project = 'project_name'
+copyright = '2024, CCP Games'
+>>>>>>> template/carbonengine/resources-updates
+=======
+project = 'project_name'
+copyright = '2024, CCP Games'
+>>>>>>> template/carbonengine/resources-updates
+=======
+project = 'project_name'
+copyright = '2024, CCP Games'
+>>>>>>> template/carbonengine/resources-updates
 author = 'CCP Games'
 release = '0.1'
 
diff --git a/doc/source/index.rst b/doc/source/index.rst
index f0f0b8f..82ce9b2 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
 resources Documentation
 ==============================
 
@@ -42,3 +46,51 @@ Contents
    This project is under active development.
 
 
+=======
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+project_name Documentation
+==========================
+
+*project_name* is generated from `carbon-template`.
+
+..
+    Top-level table of contents
+    List documentation sources below
+
+.. toctree::
+    :maxdepth: 1
+    :caption: Contents
+
+.. hint::
+    This project supports documentation authoring using *reStructuredText* and the *MyST* markdown language.
+
+    Python docstrings are pulled in automatically using *autodoc*
+
+.. seealso::
+
+    `reST usages`_
+        For authoring documentation using *reStructuredText*.
+
+    `MyST with Sphinx`_
+        For authoring documentation using *MyST* flavored markdown.
+
+.. _reST usages: https://www.sphinx-doc.org/en/master/usage/restructuredtext
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+.. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html
+>>>>>>> template/carbonengine/resources-updates
+=======
+.. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html
+>>>>>>> template/carbonengine/resources-updates
+=======
+.. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html
+>>>>>>> template/carbonengine/resources-updates
+=======
+.. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html
+>>>>>>> template/carbonengine/resources-updates
diff --git a/include/include.md b/include/include.md
new file mode 100644
index 0000000..1cdda44
--- /dev/null
+++ b/include/include.md
@@ -0,0 +1,6 @@
+# /include
+
+This folder is where all relevant includes for the project should be stored, such as `.h` files.
+
+[See an example here](https://github.com/ccpgames/carbon-blueexposure/tree/main/include)
+
diff --git a/package_nameConfig.cmake b/package_nameConfig.cmake
new file mode 100644
index 0000000..8255c9c
--- /dev/null
+++ b/package_nameConfig.cmake
@@ -0,0 +1,34 @@
+include(CMakeFindDependencyMacro)
+
+# ${CMAKE_CURRENT_LIST_DIR}/project_name.cmake is generated automatically by cmake as part of the install step
+include(${CMAKE_CURRENT_LIST_DIR}/package_name.cmake)
+
+# Please specify all of this projects transitive dependencies here
+# In order for a consuming cmake project system to locate any transitive dependencies of this project, they must be
+# specified here in a call to find_dependency(...)
+#
+# Example:
+#
+# My project CMakeLists.txt file looks like this:
+# ------------------------
+# MyProject/CMakeLists.txt
+# ------------------------
+#
+# find_package(a CONFIG NO_CMAKE_PATH REQUIRED)
+# find_package(b CONFIG NO_CMAKE_PATH REQUIRED)
+# find_package(c CONFIG NO_CMAKE_PATH REQUIRED)
+# target_link_libraries(MyProjectTarget PRIVATE package_a PUBLIC package_b INTERFACE package_c)
+# . . .
+#
+
+# Then the myprojectConfig file (this file) looks like this:
+#--------------------------------
+# MyProject/myprojectConfig.cmake
+# -------------------------------
+#
+# include(CMakeFindDependencyMacro)
+# include(${CMAKE_CURRENT_LIST_DIR}/myproject.cmake)
+#
+# find_dependency(b CONFIG NO_CMAKE_PATH REQUIRED)
+# find_dependency(c CONFIG NO_CMAKE_PATH REQUIRED)
+#
\ No newline at end of file
diff --git a/tests/tests.md b/tests/tests.md
index f2ffc7d..69f2ae8 100644
--- a/tests/tests.md
+++ b/tests/tests.md
@@ -2,4 +2,29 @@
 
 This folder is where all the tests for the project should be stored, whether they be Python tests or C++ tests.
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
 [See a C++ example here](https://github.com/carbonengine/resources/tree/main/tests/src)
+=======
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+[See a C++ example here](https://github.com/ccpgames/carbon-destiny/tree/main/tests)
+
+[See a Python example here](https://github.com/ccpgames/carbon-fsd/tree/main/tests)
+
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
index 0e85ebe..17370f4 100644
--- a/vcpkg-configuration.json
+++ b/vcpkg-configuration.json
@@ -1,15 +1,61 @@
 {
   "default-registry": {
     "kind": "git",
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
     "baseline": "bea476a80218a581bcb5318595849520217c825e",
+=======
+    "baseline": "242ac6932a9cd2607332969129e9572516f28d65",
+>>>>>>> template/carbonengine/resources-updates
+=======
+    "baseline": "242ac6932a9cd2607332969129e9572516f28d65",
+>>>>>>> template/carbonengine/resources-updates
+=======
+    "baseline": "242ac6932a9cd2607332969129e9572516f28d65",
+>>>>>>> template/carbonengine/resources-updates
+=======
+    "baseline": "242ac6932a9cd2607332969129e9572516f28d65",
+>>>>>>> template/carbonengine/resources-updates
     "repository": "https://github.com/microsoft/vcpkg.git"
   },
   "registries": [
     {
       "kind": "git",
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
       "repository": "git@github.com:carbonengine/vcpkg-registry.git",
       "baseline": "b3b922c476b0dedfa8342a75e89975c74441fc75",
       "packages": ["carbon-*", "python3", "bsdiff-drake127"]
+=======
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+      "repository": "git@github.com:ccpgames/carbon-vcpkg-registry.git",
+      "baseline": "bd0e4644d7d8a7ce9bfa426192cdf37a23e61b5f",
+      "packages": ["carbon-pdmprotowrapper", "carbon-pdm", "carbon-blueexposure", "carbon-blue", "carbon-exefile", "carbon-exefile-interpreter", "carbon-io", "carbon-math"]
+    },
+    {
+      "kind": "git",
+      "repository": "git@github.com:carbonengine/vcpkg-registry.git",
+      "baseline": "303eacceb8ce9a0aa9a061f00ab2c11e8725ab2d",
+      "packages": ["python3", "carbon-core", "carbon-scheduler", "tracy", "greenlet", "ccp-debug-info", "crashpad", "zlib"]
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
+=======
+>>>>>>> template/carbonengine/resources-updates
     }
   ]
 }
diff --git a/vcpkg.json b/vcpkg.json
index 3ef0af4..e852b60 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "dependencies": [
     {
+<<<<<<< HEAD
       "name": "bsdiff-drake127",
       "version>=": "4.3.3#2"
     },
@@ -61,4 +62,17 @@
       ]
     }
   }
+=======
+      "name": "python3",
+      "version>=": "3.12.9#1",
+      "host": true
+    }
+  ],
+  "overrides": [
+    {
+      "name": "protobuf",
+      "version": "3.6.0.1"
+    }
+  ]
+>>>>>>> template/carbonengine/resources-updates
 }