Resolved merge conflicts

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

Gems/Atom/Feature/Common/Code/Source/ProfilingCaptureSystemComponent.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Contributors to the Open 3D Engine Project
+ * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
  * 
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
@@ -141,7 +141,7 @@ namespace AZ
             static void Reflect(AZ::ReflectContext* context);
 
             CpuProfilingStatisticsSerializer() = default;
-            CpuProfilingStatisticsSerializer(RHI::CpuProfiler::TimeRegionMap& timeRegionMap);
+            CpuProfilingStatisticsSerializer(const RHI::CpuProfiler::TimeRegionMap& timeRegionMap);
 
             AZStd::vector<CpuProfilingStatisticsSerializerEntry> m_cpuProfilingStatisticsSerializerEntries;
         };
@@ -286,14 +286,17 @@ namespace AZ
 
         // --- CpuProfilingStatisticsSerializer ---
 
-        CpuProfilingStatisticsSerializer::CpuProfilingStatisticsSerializer(RHI::CpuProfiler::TimeRegionMap& timeRegionMap)
+        CpuProfilingStatisticsSerializer::CpuProfilingStatisticsSerializer(const RHI::CpuProfiler::TimeRegionMap& timeRegionMap)
         {
             // Create serializable entries
-            for (auto& treadEntry : timeRegionMap)
+            for (auto& threadEntry : timeRegionMap)
             {
-                for (auto& cachedRegionEntry : treadEntry.second)
+                for (auto& cachedRegionEntry : threadEntry.second)
                 {
-                    m_cpuProfilingStatisticsSerializerEntries.emplace_back(cachedRegionEntry.second);
+                    m_cpuProfilingStatisticsSerializerEntries.insert(
+                        m_cpuProfilingStatisticsSerializerEntries.end(),
+                        cachedRegionEntry.second.begin(),
+                        cachedRegionEntry.second.end());
                 }
             }
         }
@@ -545,8 +548,7 @@ namespace AZ
                 serializationSettings.m_keepDefaults = true;
 
                 // Get time Cpu profiled time regions
-                RHI::CpuProfiler::TimeRegionMap timeRegionMap;
-                RHI::CpuProfiler::Get()->FlushTimeRegionMap(timeRegionMap);
+                const RHI::CpuProfiler::TimeRegionMap& timeRegionMap = RHI::CpuProfiler::Get()->GetTimeRegionMap();
 
                 CpuProfilingStatisticsSerializer serializer(timeRegionMap);
                 const auto saveResult = JsonSerializationUtils::SaveObjectToFile(&serializer,