Fixed merge conflicts

ScriptableRenderPipeline/HDRenderPipeline/Editor/HDAssetFactory.cs

         {
             string HDRenderPipelinePath = HDEditorUtils.GetHDRenderPipelinePath();
             string PostProcessingPath = HDEditorUtils.GetPostProcessingPath();
+            string CorePath = HDEditorUtils.GetCorePath();
 
             var instance = ScriptableObject.CreateInstance<RenderPipelineResources>();
 
             instance.volumetricLightingCS = Load<ComputeShader>(HDRenderPipelinePath + "Lighting/Volumetrics/Resources/VolumetricLighting.compute");
             instance.gaussianPyramidCS = Load<ComputeShader>(PostProcessingPath + "Shaders/Builtins/GaussianDownsample.compute");
             instance.depthPyramidCS = Load<ComputeShader>(HDRenderPipelinePath + "RenderPipelineResources/DepthDownsample.compute");
-            instance.copyChannelCS = Load<ComputeShader>(HDRenderPipelinePath + "RenderPipelineResources/CopyChannel.compute");
+            instance.copyChannelCS = Load<ComputeShader>(CorePath + "Resources/GPUCopy.compute");
 
             instance.clearDispatchIndirectShader = Load<ComputeShader>(HDRenderPipelinePath + "Lighting/TilePass/cleardispatchindirect.compute");
             instance.buildDispatchIndirectShader = Load<ComputeShader>(HDRenderPipelinePath + "Lighting/TilePass/builddispatchindirect.compute");

ScriptableRenderPipeline/HDRenderPipeline/Editor/HDEditorUtils.cs

             return path;
         }
 
-        // TODO: Currently depends on HDRP, should be made generic
+        // TODO: The two following functions depend on HDRP, they should be made generic
+            var relativePath = fullPath.Substring(fullPath.IndexOf("Assets"));
+            return relativePath.Replace("\\", "/") + "/";
+        }
+
+        public static string GetCorePath()
+        {
+            var hdrpPath = GetHDRenderPipelinePath();
+            var fullPath = Path.GetFullPath(hdrpPath + "../Core");
             var relativePath = fullPath.Substring(fullPath.IndexOf("Assets"));
             return relativePath.Replace("\\", "/") + "/";
         }

ScriptableRenderPipeline/Core/Resources/Editor.meta

+fileFormatVersion: 2
+guid: f00a25194233f5c4392fa05f23ecc076
+folderAsset: yes
+timeCreated: 1507130547
+licenseType: Pro
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: