Merge fixes

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Input/Texture/TextureSamplerNode.cs

 
 namespace UnityEditor.ShaderGraph
 {
-    /*
     [Title("Input/Texture/Sample 2D")]
     public class Sample2DTexture : AbstractMaterialNode, IGeneratesBodyCode, IMayRequireMeshUV
     {
 
             return uvSlot.RequiresMeshUV(channel);
         }
-    }*/
+    }
 }