diff --git a/src/Controls/src/Core/ActivityIndicator/ActivityIndicator.cs b/src/Controls/src/Core/ActivityIndicator/ActivityIndicator.cs
index f4b8efcc5bda..31c183d07013 100644
--- a/src/Controls/src/Core/ActivityIndicator/ActivityIndicator.cs
+++ b/src/Controls/src/Core/ActivityIndicator/ActivityIndicator.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/ActivityIndicator.xml" path="Type[@FullName='Microsoft.Maui.Controls.ActivityIndicator']/Docs/*" />
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<ActivityIndicatorHandler>]
+	[ElementHandler(typeof(ActivityIndicatorHandler))]
 	public partial class ActivityIndicator : View, IColorElement, IElementConfiguration<ActivityIndicator>, IActivityIndicator
 	{
 		/// <summary>Bindable property for <see cref="IsRunning"/>.</summary>
diff --git a/src/Controls/src/Core/Application/Application.cs b/src/Controls/src/Core/Application/Application.cs
index d4b91822fed5..c22d77e7f906 100644
--- a/src/Controls/src/Core/Application/Application.cs
+++ b/src/Controls/src/Core/Application/Application.cs
@@ -16,7 +16,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/Application.xml" path="Type[@FullName='Microsoft.Maui.Controls.Application']/Docs/*" />
-	[ElementHandler<ApplicationHandler>]
+	[ElementHandler(typeof(ApplicationHandler))]
 	public partial class Application : Element, IResourcesProvider, IApplicationController, IElementConfiguration<Application>, IVisualTreeElement, IApplication
 	{
 		readonly WeakEventManager _weakEventManager = new WeakEventManager();
diff --git a/src/Controls/src/Core/Border/Border.cs b/src/Controls/src/Core/Border/Border.cs
index 4ffcd2337889..a31e675b7126 100644
--- a/src/Controls/src/Core/Border/Border.cs
+++ b/src/Controls/src/Core/Border/Border.cs
@@ -11,14 +11,8 @@
 namespace Microsoft.Maui.Controls
 {
 	[ContentProperty(nameof(Content))]
-<<<<<<< HEAD
-	[ElementHandler<BorderHandler>]
-	public class Border : View, IContentView, IBorderView, IPaddingElement
-||||||| 3f26a592b2
-	public class Border : View, IContentView, IBorderView, IPaddingElement
-=======
+	[ElementHandler(typeof(BorderHandler))]
 	public class Border : View, IContentView, IBorderView, IPaddingElement, ISafeAreaElement, ISafeAreaView2
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
 	{
 		float[]? _strokeDashPattern;
 
diff --git a/src/Controls/src/Core/BoxView/BoxView.cs b/src/Controls/src/Core/BoxView/BoxView.cs
index 66fde2f06323..ed43a9398464 100644
--- a/src/Controls/src/Core/BoxView/BoxView.cs
+++ b/src/Controls/src/Core/BoxView/BoxView.cs
@@ -7,16 +7,10 @@
 
 namespace Microsoft.Maui.Controls
 {
-<<<<<<< HEAD
-	/// <include file="../../docs/Microsoft.Maui.Controls/BoxView.xml" path="Type[@FullName='Microsoft.Maui.Controls.BoxView']/Docs/*" />
-	[ElementHandler<BoxViewHandler>]
-||||||| 3f26a592b2
-	/// <include file="../../docs/Microsoft.Maui.Controls/BoxView.xml" path="Type[@FullName='Microsoft.Maui.Controls.BoxView']/Docs/*" />
-=======
 	/// <summary>
 	/// A <see cref="View" /> used to draw a solid colored rectangle.
 	/// </summary>
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
+	[ElementHandler(typeof(BoxViewHandler))]
 	public partial class BoxView : View, IColorElement, ICornerElement, IElementConfiguration<BoxView>, IShapeView, IShape
 	{
 		/// <summary>Bindable property for <see cref="Color"/>.</summary>
diff --git a/src/Controls/src/Core/Button/Button.cs b/src/Controls/src/Core/Button/Button.cs
index 4332294c235c..828f99c7cd61 100644
--- a/src/Controls/src/Core/Button/Button.cs
+++ b/src/Controls/src/Core/Button/Button.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Maui.Controls
 	/// A button <see cref="View" /> that reacts to touch events.
 	/// </summary>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<ButtonHandler>]
+	[ElementHandler(typeof(ButtonHandler))]
 	public partial class Button : View, IFontElement, ITextElement, IBorderElement, IButtonController, IElementConfiguration<Button>, IPaddingElement, IImageController, IViewController, IButtonElement, ICommandElement, IImageElement, IButton, ITextButton, IImageButton
 	{
 		const double DefaultSpacing = 10;
diff --git a/src/Controls/src/Core/Cells/Cell.cs b/src/Controls/src/Core/Cells/Cell.cs
index 3172101d7f94..b6aa947535c9 100644
--- a/src/Controls/src/Core/Cells/Cell.cs
+++ b/src/Controls/src/Core/Cells/Cell.cs
@@ -10,18 +10,12 @@
 namespace Microsoft.Maui.Controls
 {
 	// Don't add IElementConfiguration<Cell> because it kills performance on UWP structures that use Cells
-<<<<<<< HEAD
-	/// <include file="../../../docs/Microsoft.Maui.Controls/Cell.xml" path="Type[@FullName='Microsoft.Maui.Controls.Cell']/Docs/*" />
+	/// <summary>Provides base class and capabilities for all Microsoft.Maui.Controls cells. Cells are elements meant to be added to <see cref="Microsoft.Maui.Controls.ListView"/> or <see cref="Microsoft.Maui.Controls.TableView"/>.</summary>
 #if WINDOWS || ANDROID || IOS || MACCATALYST
 #pragma warning disable CS0618 // Type or member is obsolete
-	[ElementHandler<Handlers.Compatibility.CellRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.CellRenderer))]
 #pragma warning restore CS0618 // Type or member is obsolete
 #endif
-||||||| 3f26a592b2
-	/// <include file="../../../docs/Microsoft.Maui.Controls/Cell.xml" path="Type[@FullName='Microsoft.Maui.Controls.Cell']/Docs/*" />
-=======
-	/// <summary>Provides base class and capabilities for all Microsoft.Maui.Controls cells. Cells are elements meant to be added to <see cref="Microsoft.Maui.Controls.ListView"/> or <see cref="Microsoft.Maui.Controls.TableView"/>.</summary>
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
 	public abstract class Cell : Element, ICellController, IFlowDirectionController, IPropertyPropagationController, IVisualController, IWindowController, IVisualTreeElement
 	{
 		/// <summary>The default height of cells.</summary>
diff --git a/src/Controls/src/Core/Cells/EntryCell.cs b/src/Controls/src/Core/Cells/EntryCell.cs
index 2319c681435b..b93e5084b5e1 100644
--- a/src/Controls/src/Core/Cells/EntryCell.cs
+++ b/src/Controls/src/Core/Cells/EntryCell.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Maui.Controls
 	[Obsolete("The controls which use EntryCell (ListView and TableView) are obsolete. Please use CollectionView instead.")]
 #if WINDOWS || ANDROID || IOS || MACCATALYST
 #pragma warning disable CS0618 // Type or member is obsolete
-	[ElementHandler<Handlers.Compatibility.EntryCellRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.EntryCellRenderer))]
 #pragma warning restore CS0618 // Type or member is obsolete
 #endif
 	public class EntryCell : Cell, ITextAlignmentElement, IEntryCellController, ITextAlignment
diff --git a/src/Controls/src/Core/Cells/ImageCell.cs b/src/Controls/src/Core/Cells/ImageCell.cs
index c75d04bf74bb..38e81d715fcd 100644
--- a/src/Controls/src/Core/Cells/ImageCell.cs
+++ b/src/Controls/src/Core/Cells/ImageCell.cs
@@ -6,7 +6,7 @@ namespace Microsoft.Maui.Controls
 	/// <summary>A <see cref="Microsoft.Maui.Controls.TextCell"/> that has an image.</summary>
 	[Obsolete("The controls which use ImageCell (ListView and TableView) are obsolete. Please use CollectionView instead.")]
 #if WINDOWS || ANDROID || IOS || MACCATALYST
-	[ElementHandler<Handlers.Compatibility.ImageCellRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.ImageCellRenderer))]
 #endif
 	public class ImageCell : TextCell
 	{
diff --git a/src/Controls/src/Core/Cells/SwitchCell.cs b/src/Controls/src/Core/Cells/SwitchCell.cs
index 4dd878d86dc7..b7bfd947df58 100644
--- a/src/Controls/src/Core/Cells/SwitchCell.cs
+++ b/src/Controls/src/Core/Cells/SwitchCell.cs
@@ -8,7 +8,7 @@ namespace Microsoft.Maui.Controls
 	[Obsolete("The controls which use SwitchCell (ListView and TableView) are obsolete. Please use CollectionView instead.")]
 #if WINDOWS || ANDROID || IOS || MACCATALYST || TIZEN
 #pragma warning disable CS0618 // Type or member is obsolete
-	[ElementHandler<Handlers.Compatibility.SwitchCellRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.SwitchCellRenderer))]
 #pragma warning restore CS0618 // Type or member is obsolete
 #endif
 	public class SwitchCell : Cell
diff --git a/src/Controls/src/Core/Cells/TextCell.cs b/src/Controls/src/Core/Cells/TextCell.cs
index 7dc0af482a5f..6b300e842fb1 100644
--- a/src/Controls/src/Core/Cells/TextCell.cs
+++ b/src/Controls/src/Core/Cells/TextCell.cs
@@ -8,18 +8,12 @@ namespace Microsoft.Maui.Controls
 {
 	/// <summary>A <see cref="Microsoft.Maui.Controls.Cell"/> with primary <see cref="Microsoft.Maui.Controls.TextCell.Text"/>  and <see cref="Microsoft.Maui.Controls.TextCell.Detail"/> text.</summary>
 	[Obsolete("The controls which use TextCell (ListView and TableView) are obsolete. Please use CollectionView instead.")]
-<<<<<<< HEAD
 #if WINDOWS || ANDROID || IOS || MACCATALYST
 #pragma warning disable CS0618 // Type or member is obsolete
-	[ElementHandler<Handlers.Compatibility.TextCellRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.TextCellRenderer))]
 #pragma warning restore CS0618 // Type or member is obsolete
 #endif
-	public class TextCell : Cell
-||||||| 3f26a592b2
-	public class TextCell : Cell
-=======
 	public class TextCell : Cell, ICommandElement
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
 	{
 		/// <summary>Bindable property for <see cref="Command"/>.</summary>
 		public static readonly BindableProperty CommandProperty =
diff --git a/src/Controls/src/Core/Cells/ViewCell.cs b/src/Controls/src/Core/Cells/ViewCell.cs
index b7284eb79944..419389f62333 100644
--- a/src/Controls/src/Core/Cells/ViewCell.cs
+++ b/src/Controls/src/Core/Cells/ViewCell.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Maui.Controls
 	[ContentProperty("View")]
 #if WINDOWS || IOS || MACCATALYST || ANDROID || TIZEN
 #pragma warning disable CS0618 // Type or member is obsolete
-	[ElementHandler<Handlers.Compatibility.ViewCellRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.ViewCellRenderer))]
 #pragma warning restore CS0618 // Type or member is obsolete
 #endif
 	public class ViewCell : Cell
diff --git a/src/Controls/src/Core/CheckBox/CheckBox.cs b/src/Controls/src/Core/CheckBox/CheckBox.cs
index f13ab47ff78e..186bc4c1fbe6 100644
--- a/src/Controls/src/Core/CheckBox/CheckBox.cs
+++ b/src/Controls/src/Core/CheckBox/CheckBox.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/CheckBox.xml" path="Type[@FullName='Microsoft.Maui.Controls.CheckBox']/Docs/*" />
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<CheckBoxHandler>]
+	[ElementHandler(typeof(CheckBoxHandler))]
 	public partial class CheckBox : View, IElementConfiguration<CheckBox>, IBorderElement, IColorElement, ICheckBox, ICommandElement
 	{
 		readonly Lazy<PlatformConfigurationRegistry<CheckBox>> _platformConfigurationRegistry;
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
index 5507a083c27b..6c179aaff51d 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
@@ -53,8 +53,8 @@ public static CommandMapper<Frame, FrameRenderer> CommandMapper
 
 		const double LegacyMinimumFrameSize = 20;
 
-		static FrameRenderer IElementHandlerWithAndroidContext<FrameRenderer>.CreateHandler(Context context)
-			=> new FrameRenderer(context);
+		static FrameRenderer IElementHandlerWithAndroidContext<FrameRenderer>.CreateHandler(Context? context)
+			=> new FrameRenderer(context!);
 
 		public FrameRenderer(Context context) : this(context, Mapper)
 		{
diff --git a/src/Controls/src/Core/ContentView/ContentView.cs b/src/Controls/src/Core/ContentView/ContentView.cs
index 9928d31ef463..9939f2bbe310 100644
--- a/src/Controls/src/Core/ContentView/ContentView.cs
+++ b/src/Controls/src/Core/ContentView/ContentView.cs
@@ -10,14 +10,8 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/ContentView.xml" path="Type[@FullName='Microsoft.Maui.Controls.ContentView']/Docs/*" />
 	[ContentProperty("Content")]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-<<<<<<< HEAD
-	[ElementHandler<ContentViewHandler>]
-	public partial class ContentView : TemplatedView, IContentView
-||||||| 3f26a592b2
-	public partial class ContentView : TemplatedView, IContentView
-=======
+	[ElementHandler(typeof(ContentViewHandler))]
 	public partial class ContentView : TemplatedView, IContentView, ISafeAreaView2, ISafeAreaElement
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
 	{
 		/// <summary>Bindable property for <see cref="Content"/>.</summary>
 		public static readonly BindableProperty ContentProperty = BindableProperty.Create(nameof(Content), typeof(View), typeof(ContentView), null, propertyChanged: TemplateUtilities.OnContentChanged);
diff --git a/src/Controls/src/Core/DatePicker/DatePicker.cs b/src/Controls/src/Core/DatePicker/DatePicker.cs
index 1cd005aa2920..2f488e41f80e 100644
--- a/src/Controls/src/Core/DatePicker/DatePicker.cs
+++ b/src/Controls/src/Core/DatePicker/DatePicker.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <summary>A <see cref="Microsoft.Maui.Controls.View"/> that allows date picking.</summary>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<DatePickerHandler>]
+	[ElementHandler(typeof(DatePickerHandler))]
 	public partial class DatePicker : View, IFontElement, ITextElement, IElementConfiguration<DatePicker>, IDatePicker
 	{
 		/// <summary>Bindable property for <see cref="Format"/>.</summary>
diff --git a/src/Controls/src/Core/Editor/Editor.cs b/src/Controls/src/Core/Editor/Editor.cs
index 85958fba0c41..a721e313a7c5 100644
--- a/src/Controls/src/Core/Editor/Editor.cs
+++ b/src/Controls/src/Core/Editor/Editor.cs
@@ -9,14 +9,8 @@
 
 namespace Microsoft.Maui.Controls
 {
-<<<<<<< HEAD
-	/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="Type[@FullName='Microsoft.Maui.Controls.Editor']/Docs/*" />
-	[ElementHandler<EditorHandler>]
-||||||| 3f26a592b2
-	/// <include file="../../docs/Microsoft.Maui.Controls/Editor.xml" path="Type[@FullName='Microsoft.Maui.Controls.Editor']/Docs/*" />
-=======
 	/// <summary>A control that can edit multiple lines of text.</summary>
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
+	[ElementHandler(typeof(EditorHandler))]
 	public partial class Editor : InputView, IEditorController, ITextAlignmentElement, IElementConfiguration<Editor>, IEditor
 	{
 		/// <summary>Identifies the Text bindable property.</summary>
diff --git a/src/Controls/src/Core/Entry/Entry.cs b/src/Controls/src/Core/Entry/Entry.cs
index bc3e9e565fd9..5a3c9fbf45a0 100644
--- a/src/Controls/src/Core/Entry/Entry.cs
+++ b/src/Controls/src/Core/Entry/Entry.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Maui.Controls
 	/// <summary>
 	/// Entry is a single line text entry. It is best used for collecting small discrete pieces of information, like usernames and passwords.
 	/// </summary>
-	[ElementHandler<EntryHandler>]
+	[ElementHandler(typeof(EntryHandler))]
 	public partial class Entry : InputView, ITextAlignmentElement, IEntryController, IElementConfiguration<Entry>, IEntry
 	{
 		/// <summary>
diff --git a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
index 9816bc4e1d76..ca75755e2bb5 100644
--- a/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
+++ b/src/Controls/src/Core/FlyoutPage/FlyoutPage.cs
@@ -15,9 +15,9 @@ namespace Microsoft.Maui.Controls
 	[ContentProperty(nameof(Detail))]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
 #if IOS || MACCATALYST
-	[ElementHandler<Handlers.Compatibility.PhoneFlyoutPageRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.PhoneFlyoutPageRenderer))]
 #elif WINDOWS || ANDROID || TIZEN
-	[ElementHandler<FlyoutViewHandler>]
+	[ElementHandler(typeof(FlyoutViewHandler))]
 #endif
 	public partial class FlyoutPage : Page, IFlyoutPageController, IElementConfiguration<FlyoutPage>, IFlyoutView
 	{
diff --git a/src/Controls/src/Core/Frame/Frame.cs b/src/Controls/src/Core/Frame/Frame.cs
index f5aa74c3bd44..86fb01fbc074 100644
--- a/src/Controls/src/Core/Frame/Frame.cs
+++ b/src/Controls/src/Core/Frame/Frame.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Maui.Controls
 	[Obsolete("Frame is obsolete as of .NET 9. Please use Border instead.")]
 #if WINDOWS || IOS || MACCATALYST || TIZEN
 #pragma warning disable CS0618 // Type or member is obsolete
-	[ElementHandler<Handlers.Compatibility.FrameRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.FrameRenderer))]
 #pragma warning restore CS0618 // Type or member is obsolete
 #elif ANDROID
 #pragma warning disable CS0618 // Type or member is obsolete
diff --git a/src/Controls/src/Core/GraphicsView/GraphicsView.cs b/src/Controls/src/Core/GraphicsView/GraphicsView.cs
index fe46dafa00c0..d3e1e03ebf13 100644
--- a/src/Controls/src/Core/GraphicsView/GraphicsView.cs
+++ b/src/Controls/src/Core/GraphicsView/GraphicsView.cs
@@ -5,7 +5,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	[ElementHandler<GraphicsViewHandler>]
+	[ElementHandler(typeof(GraphicsViewHandler))]
 	public class GraphicsView : View, IGraphicsView
 	{
 		public event EventHandler<TouchEventArgs> StartHoverInteraction;
diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index 705505a50251..5a10b16263ae 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -10,7 +10,8 @@ namespace Microsoft.Maui.Controls
 	/// A <see cref="View"/> that presents local HTML content in a web view and allows JavaScript and C# code to
 	/// communicate by using messages and by invoking methods.
 	/// </summary>
-	[ElementHandler<HybridWebViewHandler>]
+	[UnconditionalSuppressMessage("Trimming", "IL2026")]
+	[ElementHandler(typeof(HybridWebViewHandler))]
 	public class HybridWebView : View, IHybridWebView
 	{
 		/// <summary>Bindable property for <see cref="DefaultFile"/>.</summary>
diff --git a/src/Controls/src/Core/Image/Image.cs b/src/Controls/src/Core/Image/Image.cs
index 8512f4c99adf..c6f0ffa94bb4 100644
--- a/src/Controls/src/Core/Image/Image.cs
+++ b/src/Controls/src/Core/Image/Image.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <summary><see cref="Microsoft.Maui.Controls.View"/> that holds an image.</summary>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<ImageHandler>]
+	[ElementHandler(typeof(ImageHandler))]
 	public partial class Image : View, IImageController, IElementConfiguration<Image>, IViewController, IImageElement, IImage
 	{
 		/// <summary>Bindable property for <see cref="Source"/>.</summary>
diff --git a/src/Controls/src/Core/ImageButton/ImageButton.cs b/src/Controls/src/Core/ImageButton/ImageButton.cs
index 6210be370b2f..b7ca30747270 100644
--- a/src/Controls/src/Core/ImageButton/ImageButton.cs
+++ b/src/Controls/src/Core/ImageButton/ImageButton.cs
@@ -11,7 +11,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/ImageButton.xml" path="Type[@FullName='Microsoft.Maui.Controls.ImageButton']/Docs/*" />
-	[ElementHandler<ImageButtonHandler>]
+	[ElementHandler(typeof(ImageButtonHandler))]
 	public partial class ImageButton : View, IImageController, IElementConfiguration<ImageButton>, IBorderElement, IButtonController, IViewController, IPaddingElement, IButtonElement, ICommandElement, IImageElement, IImageButton
 	{
 		const int DefaultCornerRadius = -1;
diff --git a/src/Controls/src/Core/IndicatorView/IndicatorView.cs b/src/Controls/src/Core/IndicatorView/IndicatorView.cs
index 4e0c14c6fc4d..58776aaf153c 100644
--- a/src/Controls/src/Core/IndicatorView/IndicatorView.cs
+++ b/src/Controls/src/Core/IndicatorView/IndicatorView.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/IndicatorView.xml" path="Type[@FullName='Microsoft.Maui.Controls.IndicatorView']/Docs/*" />
 	[ContentProperty(nameof(IndicatorLayout))]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<IndicatorViewHandler>]
+	[ElementHandler(typeof(IndicatorViewHandler))]
 	public partial class IndicatorView : TemplatedView, ITemplatedIndicatorView
 	{
 		const int DefaultPadding = 4;
diff --git a/src/Controls/src/Core/Items/CarouselView.cs b/src/Controls/src/Core/Items/CarouselView.cs
index 735ff6443951..8ef6402c30d2 100644
--- a/src/Controls/src/Core/Items/CarouselView.cs
+++ b/src/Controls/src/Core/Items/CarouselView.cs
@@ -11,18 +11,12 @@
 
 namespace Microsoft.Maui.Controls
 {
-<<<<<<< HEAD
-	/// <include file="../../../docs/Microsoft.Maui.Controls/CarouselView.xml" path="Type[@FullName='Microsoft.Maui.Controls.CarouselView']/Docs/*" />
+	/// <summary>A <see cref="Microsoft.Maui.Controls.ItemsView"/> whose scrollable child views 'snap' into place.</summary>
 #if IOS || MACCATALYST
-	[ElementHandler<Handlers.Items2.CarouselViewHandler2>]
+	[ElementHandler(typeof(Handlers.Items2.CarouselViewHandler2))]
 #else
-	[ElementHandler<Handlers.Items.CarouselViewHandler>]
+	[ElementHandler(typeof(Handlers.Items.CarouselViewHandler))]
 #endif
-||||||| 3f26a592b2
-	/// <include file="../../../docs/Microsoft.Maui.Controls/CarouselView.xml" path="Type[@FullName='Microsoft.Maui.Controls.CarouselView']/Docs/*" />
-=======
-	/// <summary>A <see cref="Microsoft.Maui.Controls.ItemsView"/> whose scrollable child views 'snap' into place.</summary>
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
 	public class CarouselView : ItemsView
 	{
 		/// <include file="../../../docs/Microsoft.Maui.Controls/CarouselView.xml" path="//Member[@MemberName='CurrentItemVisualState']/Docs/*" />
diff --git a/src/Controls/src/Core/Items/CollectionView.cs b/src/Controls/src/Core/Items/CollectionView.cs
index be61d55f1663..105608b9158d 100644
--- a/src/Controls/src/Core/Items/CollectionView.cs
+++ b/src/Controls/src/Core/Items/CollectionView.cs
@@ -8,18 +8,12 @@
 
 namespace Microsoft.Maui.Controls
 {
-<<<<<<< HEAD
-	/// <include file="../../../docs/Microsoft.Maui.Controls/CollectionView.xml" path="Type[@FullName='Microsoft.Maui.Controls.CollectionView']/Docs/*" />
+	/// <summary>A <see cref="Microsoft.Maui.Controls.SelectableItemsView"/> that presents a collection of items.</summary>
 #if IOS || MACCATALYST
-	[ElementHandler<Handlers.Items2.CollectionViewHandler2>]
+	[ElementHandler(typeof(Handlers.Items2.CollectionViewHandler2))]
 #else
-	[ElementHandler<Handlers.Items.CollectionViewHandler>]
+	[ElementHandler(typeof(Handlers.Items.CollectionViewHandler))]
 #endif
-||||||| 3f26a592b2
-	/// <include file="../../../docs/Microsoft.Maui.Controls/CollectionView.xml" path="Type[@FullName='Microsoft.Maui.Controls.CollectionView']/Docs/*" />
-=======
-	/// <summary>A <see cref="Microsoft.Maui.Controls.SelectableItemsView"/> that presents a collection of items.</summary>
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
 	public class CollectionView : ReorderableItemsView
 	{
 	}
diff --git a/src/Controls/src/Core/Label/Label.cs b/src/Controls/src/Core/Label/Label.cs
index 80a58e71a903..3275e90bce50 100644
--- a/src/Controls/src/Core/Label/Label.cs
+++ b/src/Controls/src/Core/Label/Label.cs
@@ -15,7 +15,7 @@ namespace Microsoft.Maui.Controls
 	/// <summary>A <see cref="Microsoft.Maui.Controls.View"/> that displays text.</summary>
 	[ContentProperty(nameof(Text))]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<LabelHandler>]
+	[ElementHandler(typeof(LabelHandler))]
 	public partial class Label : View, IFontElement, ITextElement, ITextAlignmentElement, ILineHeightElement, IElementConfiguration<Label>, IDecorableTextElement, IPaddingElement, ILabel
 	{
 		/// <summary>Bindable property for <see cref="HorizontalTextAlignment"/>.</summary>
diff --git a/src/Controls/src/Core/Layout/Layout.cs b/src/Controls/src/Core/Layout/Layout.cs
index 7f0bfcd4c94a..55bf15cb9931 100644
--- a/src/Controls/src/Core/Layout/Layout.cs
+++ b/src/Controls/src/Core/Layout/Layout.cs
@@ -18,14 +18,8 @@ namespace Microsoft.Maui.Controls
 	/// </summary>
 	[ContentProperty(nameof(Children))]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-<<<<<<< HEAD
-	[ElementHandler<LayoutHandler>]
-	public abstract partial class Layout : View, Maui.ILayout, IList<IView>, IBindableLayout, IPaddingElement, IVisualTreeElement, ISafeAreaView, IInputTransparentContainerElement
-||||||| 3f26a592b2
-	public abstract partial class Layout : View, Maui.ILayout, IList<IView>, IBindableLayout, IPaddingElement, IVisualTreeElement, ISafeAreaView, IInputTransparentContainerElement
-=======
+	[ElementHandler(typeof(LayoutHandler))]
 	public abstract partial class Layout : View, Maui.ILayout, IList<IView>, IBindableLayout, IPaddingElement, IVisualTreeElement, ISafeAreaView, IInputTransparentContainerElement, ISafeAreaView2, ISafeAreaElement
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
 	{
 		protected ILayoutManager _layoutManager;
 
diff --git a/src/Controls/src/Core/ListView/ListView.cs b/src/Controls/src/Core/ListView/ListView.cs
index 9c2c5bc16ec0..940d4b70e740 100644
--- a/src/Controls/src/Core/ListView/ListView.cs
+++ b/src/Controls/src/Core/ListView/ListView.cs
@@ -15,24 +15,18 @@
 
 namespace Microsoft.Maui.Controls
 {
-<<<<<<< HEAD
-	/// <include file="../../docs/Microsoft.Maui.Controls/ListView.xml" path="Type[@FullName='Microsoft.Maui.Controls.ListView']/Docs/*" />
-	[Obsolete("Please use CollectionView instead.")]
+	/// <summary>An <see cref="Microsoft.Maui.Controls.ItemsView{T}"/> that displays a collection of data as a vertical list.</summary>
+	[Obsolete("ListView is deprecated. Please use CollectionView instead.")]
 #if WINDOWS || IOS || MACCATALYST || TIZEN
 #pragma warning disable CS0618 // Type or member is obsolete
-	[ElementHandler<Handlers.Compatibility.ListViewRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.ListViewRenderer))]
 #pragma warning restore CS0618 // Type or member is obsolete
+#endif
 #if ANDROID
+#pragma warning disable CS0618 // Type or member is obsolete
 	[ElementHandlerWithAndroidContext<Handlers.Compatibility.ListViewRenderer>]
+#pragma warning restore CS0618 // Type or member is obsolete
 #endif
-#endif
-||||||| 3f26a592b2
-	/// <include file="../../docs/Microsoft.Maui.Controls/ListView.xml" path="Type[@FullName='Microsoft.Maui.Controls.ListView']/Docs/*" />
-	[Obsolete("Please use CollectionView instead.")]
-=======
-	/// <summary>An <see cref="Microsoft.Maui.Controls.ItemsView{T}"/> that displays a collection of data as a vertical list.</summary>
-	[Obsolete("ListView is deprecated. Please use CollectionView instead.")]
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
 	public class ListView : ItemsView<Cell>, IListViewController, IElementConfiguration<ListView>, IVisualTreeElement
 	{
 		// The ListViewRenderer has some odd behavior with LogicalChildren
diff --git a/src/Controls/src/Core/Menu/MenuBar.cs b/src/Controls/src/Core/Menu/MenuBar.cs
index 0b56c424f76e..985e5e2aa6ae 100644
--- a/src/Controls/src/Core/Menu/MenuBar.cs
+++ b/src/Controls/src/Core/Menu/MenuBar.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	[ElementHandler<MenuBarHandler>]
+	[ElementHandler(typeof(MenuBarHandler))]
 	public partial class MenuBar : Element, IMenuBar
 	{
 		/// <summary>Bindable property for <see cref="IsEnabled"/>.</summary>
diff --git a/src/Controls/src/Core/Menu/MenuBarItem.cs b/src/Controls/src/Core/Menu/MenuBarItem.cs
index b80eda2803ee..04f4b07c44a1 100644
--- a/src/Controls/src/Core/Menu/MenuBarItem.cs
+++ b/src/Controls/src/Core/Menu/MenuBarItem.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	[ElementHandler<MenuBarItemHandler>]
+	[ElementHandler(typeof(MenuBarItemHandler))]
 	public partial class MenuBarItem : BaseMenuItem, IMenuBarItem
 	{
 		/// <summary>Bindable property for <see cref="Text"/>.</summary>
diff --git a/src/Controls/src/Core/Menu/MenuFlyout.cs b/src/Controls/src/Core/Menu/MenuFlyout.cs
index 1bd642fd5b56..049b821fdcf3 100644
--- a/src/Controls/src/Core/Menu/MenuFlyout.cs
+++ b/src/Controls/src/Core/Menu/MenuFlyout.cs
@@ -8,7 +8,7 @@ namespace Microsoft.Maui.Controls
 {
 
 #if WINDOWS || MACCATALYST
-	[ElementHandler<MenuFlyoutHandler>]
+	[ElementHandler(typeof(MenuFlyoutHandler))]
 #endif
 	public class MenuFlyout : FlyoutBase, IMenuFlyout // Same pattern as MenuBarItem
 	{
diff --git a/src/Controls/src/Core/Menu/MenuFlyoutItem.cs b/src/Controls/src/Core/Menu/MenuFlyoutItem.cs
index 516b8d52c8ff..d3a6b780c865 100644
--- a/src/Controls/src/Core/Menu/MenuFlyoutItem.cs
+++ b/src/Controls/src/Core/Menu/MenuFlyoutItem.cs
@@ -6,7 +6,7 @@ namespace Microsoft.Maui.Controls
 	/// <summary>
 	/// Represents a MenuFlyoutItem.
 	/// </summary>
-	[ElementHandler<MenuFlyoutItemHandler>]
+	[ElementHandler(typeof(MenuFlyoutItemHandler))]
 	public partial class MenuFlyoutItem : MenuItem, IMenuFlyoutItem
 	{
 		/// <summary>
diff --git a/src/Controls/src/Core/Menu/MenuFlyoutSeparator.cs b/src/Controls/src/Core/Menu/MenuFlyoutSeparator.cs
index 45c838080415..739be39bd8bd 100644
--- a/src/Controls/src/Core/Menu/MenuFlyoutSeparator.cs
+++ b/src/Controls/src/Core/Menu/MenuFlyoutSeparator.cs
@@ -3,7 +3,7 @@ namespace Microsoft.Maui.Controls
 	/// <summary>
 	/// Represents a horizontal line that separates items in a menu. 
 	/// </summary>
-	[ElementHandler<MenuFlyoutSeparatorHandler>]
+	[ElementHandler(typeof(MenuFlyoutSeparatorHandler))]
 	public class MenuFlyoutSeparator : MenuFlyoutItem, IMenuFlyoutSeparator
 	{
 	}
diff --git a/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs b/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs
index 93464072970a..49af5b95cdd7 100644
--- a/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs
+++ b/src/Controls/src/Core/Menu/MenuFlyoutSubItem.cs
@@ -4,7 +4,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	[ElementHandler<MenuFlyoutSubItemHandler>]
+	[ElementHandler(typeof(MenuFlyoutSubItemHandler))]
 	public partial class MenuFlyoutSubItem : MenuFlyoutItem, IMenuFlyoutSubItem
 	{
 		readonly List<IMenuElement> _menus = new List<IMenuElement>();
diff --git a/src/Controls/src/Core/NavigationPage/NavigationPage.cs b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
index ef3080c7d921..866901731372 100644
--- a/src/Controls/src/Core/NavigationPage/NavigationPage.cs
+++ b/src/Controls/src/Core/NavigationPage/NavigationPage.cs
@@ -11,18 +11,12 @@
 
 namespace Microsoft.Maui.Controls
 {
-<<<<<<< HEAD
-	/// <include file="../../docs/Microsoft.Maui.Controls/NavigationPage.xml" path="Type[@FullName='Microsoft.Maui.Controls.NavigationPage']/Docs/*" />
+	/// <summary>A <see cref="Microsoft.Maui.Controls.Page"/> that manages the navigation and user-experience of a stack of other pages.</summary>
 #if IOS || MACCATALYST
-	[ElementHandler<Handlers.Compatibility.NavigationRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.NavigationRenderer))]
 #elif WINDOWS || ANDROID || TIZEN
-	[ElementHandler<NavigationViewHandler>]
+	[ElementHandler(typeof(NavigationViewHandler))]
 #endif
-||||||| 3f26a592b2
-	/// <include file="../../docs/Microsoft.Maui.Controls/NavigationPage.xml" path="Type[@FullName='Microsoft.Maui.Controls.NavigationPage']/Docs/*" />
-=======
-	/// <summary>A <see cref="Microsoft.Maui.Controls.Page"/> that manages the navigation and user-experience of a stack of other pages.</summary>
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
 	public partial class NavigationPage : Page, IPageContainer<Page>, IBarElement, IElementConfiguration<NavigationPage>, IStackNavigationView, IToolbarElement
 	{
 		/// <summary>Bindable property for attached property <c>BackButtonTitle</c>.</summary>
diff --git a/src/Controls/src/Core/Page/Page.cs b/src/Controls/src/Core/Page/Page.cs
index 2278b39d4b52..b61c006e673a 100644
--- a/src/Controls/src/Core/Page/Page.cs
+++ b/src/Controls/src/Core/Page/Page.cs
@@ -22,14 +22,8 @@ namespace Microsoft.Maui.Controls
 	/// <remarks><see cref = "Page" /> is primarily a base class for more useful derived types. Objects that are derived from the <see cref="Page"/> class are most prominently used as the top level UI element in .NET MAUI applications. In addition to their role as the main pages of applications, <see cref="Page"/> objects and their descendants can be used with navigation classes, such as <see cref="NavigationPage"/> or <see cref="FlyoutPage"/>, among others, to provide rich user experiences that conform to the expected behaviors on each platform.
 	/// </remarks>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-<<<<<<< HEAD
-	[ElementHandler<PageHandler>]
-	public partial class Page : VisualElement, ILayout, IPageController, IElementConfiguration<Page>, IPaddingElement, ISafeAreaView, ISafeAreaView2, IView, ITitledElement, IToolbarElement, IConstrainedView
-||||||| 3f26a592b2
-	public partial class Page : VisualElement, ILayout, IPageController, IElementConfiguration<Page>, IPaddingElement, ISafeAreaView, ISafeAreaView2, IView, ITitledElement, IToolbarElement, IConstrainedView
-=======
+	[ElementHandler(typeof(PageHandler))]
 	public partial class Page : VisualElement, ILayout, IPageController, IElementConfiguration<Page>, IPaddingElement, ISafeAreaView2, IView, ITitledElement, IToolbarElement, ISafeAreaView, IConstrainedView
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
 #if IOS
 	,IiOSPageSpecifics
 #endif
diff --git a/src/Controls/src/Core/Picker/Picker.cs b/src/Controls/src/Core/Picker/Picker.cs
index c4c9c1cd9662..0d97e643f2d1 100644
--- a/src/Controls/src/Core/Picker/Picker.cs
+++ b/src/Controls/src/Core/Picker/Picker.cs
@@ -17,7 +17,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <summary>A <see cref="Microsoft.Maui.Controls.View"/> control for picking an element in a list.</summary>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<PickerHandler>]
+	[ElementHandler(typeof(PickerHandler))]
 	public partial class Picker : View, IFontElement, ITextElement, ITextAlignmentElement, IElementConfiguration<Picker>, IPicker
 	{
 		/// <summary>Bindable property for <see cref="TextColor"/>.</summary>
diff --git a/src/Controls/src/Core/ProgressBar/ProgressBar.cs b/src/Controls/src/Core/ProgressBar/ProgressBar.cs
index 345dee9d42db..27b03a1c1b84 100644
--- a/src/Controls/src/Core/ProgressBar/ProgressBar.cs
+++ b/src/Controls/src/Core/ProgressBar/ProgressBar.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/ProgressBar.xml" path="Type[@FullName='Microsoft.Maui.Controls.ProgressBar']/Docs/*" />
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<ProgressBarHandler>]
+	[ElementHandler(typeof(ProgressBarHandler))]
 	public partial class ProgressBar : View, IElementConfiguration<ProgressBar>, IProgress
 	{
 		/// <summary>Bindable property for <see cref="ProgressColor"/>.</summary>
diff --git a/src/Controls/src/Core/RadioButton/RadioButton.cs b/src/Controls/src/Core/RadioButton/RadioButton.cs
index ccc323c7d60f..f0e02848a12f 100644
--- a/src/Controls/src/Core/RadioButton/RadioButton.cs
+++ b/src/Controls/src/Core/RadioButton/RadioButton.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/RadioButton.xml" path="Type[@FullName='Microsoft.Maui.Controls.RadioButton']/Docs/*" />
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<RadioButtonHandler>]
+	[ElementHandler(typeof(RadioButtonHandler))]
 	public partial class RadioButton : TemplatedView, IElementConfiguration<RadioButton>, ITextElement, IFontElement, IBorderElement, IRadioButton
 	{
 		/// <include file="../../docs/Microsoft.Maui.Controls/RadioButton.xml" path="//Member[@MemberName='CheckedVisualState']/Docs/*" />
diff --git a/src/Controls/src/Core/RefreshView/RefreshView.cs b/src/Controls/src/Core/RefreshView/RefreshView.cs
index a4e8e7fe087d..e946ae5f8ca0 100644
--- a/src/Controls/src/Core/RefreshView/RefreshView.cs
+++ b/src/Controls/src/Core/RefreshView/RefreshView.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/RefreshView.xml" path="Type[@FullName='Microsoft.Maui.Controls.RefreshView']/Docs/*" />
 	[ContentProperty(nameof(Content))]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<RefreshViewHandler>]
+	[ElementHandler(typeof(RefreshViewHandler))]
 	public partial class RefreshView : ContentView, IElementConfiguration<RefreshView>, IRefreshView, ICommandElement
 	{
 		readonly Lazy<PlatformConfigurationRegistry<RefreshView>> _platformConfigurationRegistry;
diff --git a/src/Controls/src/Core/ScrollView/ScrollView.cs b/src/Controls/src/Core/ScrollView/ScrollView.cs
index 02a174a2c672..2f0292b17656 100644
--- a/src/Controls/src/Core/ScrollView/ScrollView.cs
+++ b/src/Controls/src/Core/ScrollView/ScrollView.cs
@@ -13,15 +13,9 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/ScrollView.xml" path="Type[@FullName='Microsoft.Maui.Controls.ScrollView']/Docs/*" />
 	[ContentProperty(nameof(Content))]
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-<<<<<<< HEAD
-	[ElementHandler<ScrollViewHandler>]
-	public partial class ScrollView : Compatibility.Layout, IScrollViewController, IElementConfiguration<ScrollView>, IFlowDirectionController, IScrollView, IContentView
-||||||| 3f26a592b2
-	public partial class ScrollView : Compatibility.Layout, IScrollViewController, IElementConfiguration<ScrollView>, IFlowDirectionController, IScrollView, IContentView
-=======
+	[ElementHandler(typeof(ScrollViewHandler))]
 #pragma warning disable CS0618 // Type or member is obsolete
 	public partial class ScrollView : Compatibility.Layout, ILayout, ILayoutController, IPaddingElement, IView, IVisualTreeElement, IInputTransparentContainerElement, IScrollViewController, IElementConfiguration<ScrollView>, IFlowDirectionController, IScrollView, IContentView, ISafeAreaElement, ISafeAreaView2
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
 #pragma warning restore CS0618 // Type or member is obsolete
 	{
 		#region IScrollViewController
diff --git a/src/Controls/src/Core/SearchBar/SearchBar.cs b/src/Controls/src/Core/SearchBar/SearchBar.cs
index 34dde534916f..4e462eeda12d 100644
--- a/src/Controls/src/Core/SearchBar/SearchBar.cs
+++ b/src/Controls/src/Core/SearchBar/SearchBar.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/SearchBar.xml" path="Type[@FullName='Microsoft.Maui.Controls.SearchBar']/Docs/*" />
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<SearchBarHandler>]
+	[ElementHandler(typeof(SearchBarHandler))]
 	public partial class SearchBar : InputView, ITextAlignmentElement, ISearchBarController, IElementConfiguration<SearchBar>, ICommandElement, ISearchBar
 	{
 		/// <summary>Bindable property for <see cref="ReturnType"/>.</summary>
diff --git a/src/Controls/src/Core/Shapes/Ellipse.cs b/src/Controls/src/Core/Shapes/Ellipse.cs
index a41c8e3378df..0aee45a93cd1 100644
--- a/src/Controls/src/Core/Shapes/Ellipse.cs
+++ b/src/Controls/src/Core/Shapes/Ellipse.cs
@@ -5,7 +5,7 @@
 namespace Microsoft.Maui.Controls.Shapes
 {
 	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Ellipse.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.Ellipse']/Docs/*" />
-	[ElementHandler<ShapeViewHandler>]
+	[ElementHandler(typeof(ShapeViewHandler))]
 	public sealed partial class Ellipse : Shape, IShape
 	{
 		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Ellipse.xml" path="//Member[@MemberName='.ctor']/Docs/*" />
diff --git a/src/Controls/src/Core/Shapes/Line.cs b/src/Controls/src/Core/Shapes/Line.cs
index 123defe6bddb..8ebcee7fc314 100644
--- a/src/Controls/src/Core/Shapes/Line.cs
+++ b/src/Controls/src/Core/Shapes/Line.cs
@@ -6,7 +6,7 @@
 namespace Microsoft.Maui.Controls.Shapes
 {
 	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Line.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.Line']/Docs/*" />
-	[ElementHandler<LineHandler>]
+	[ElementHandler(typeof(LineHandler))]
 	public sealed partial class Line : Shape, IShape
 	{
 		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Line.xml" path="//Member[@MemberName='.ctor'][1]/Docs/*" />
diff --git a/src/Controls/src/Core/Shapes/Path.cs b/src/Controls/src/Core/Shapes/Path.cs
index eff3c8343b1d..a9b58d50306c 100644
--- a/src/Controls/src/Core/Shapes/Path.cs
+++ b/src/Controls/src/Core/Shapes/Path.cs
@@ -8,7 +8,7 @@
 namespace Microsoft.Maui.Controls.Shapes
 {
 	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Path.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.Path']/Docs/*" />
-	[ElementHandler<PathHandler>]
+	[ElementHandler(typeof(PathHandler))]
 	public sealed partial class Path : Shape, IShape
 	{
 		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Path.xml" path="//Member[@MemberName='.ctor'][1]/Docs/*" />
diff --git a/src/Controls/src/Core/Shapes/Polygon.cs b/src/Controls/src/Core/Shapes/Polygon.cs
index 94a2d493c4d5..110ee670e93e 100644
--- a/src/Controls/src/Core/Shapes/Polygon.cs
+++ b/src/Controls/src/Core/Shapes/Polygon.cs
@@ -6,7 +6,7 @@
 namespace Microsoft.Maui.Controls.Shapes
 {
 	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Polygon.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.Polygon']/Docs/*" />
-	[ElementHandler<PolygonHandler>]
+	[ElementHandler(typeof(PolygonHandler))]
 	public sealed partial class Polygon : Shape, IShape
 	{
 		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Polygon.xml" path="//Member[@MemberName='.ctor'][1]/Docs/*" />
diff --git a/src/Controls/src/Core/Shapes/Polyline.cs b/src/Controls/src/Core/Shapes/Polyline.cs
index dc1bd206c28d..01f95d22c805 100644
--- a/src/Controls/src/Core/Shapes/Polyline.cs
+++ b/src/Controls/src/Core/Shapes/Polyline.cs
@@ -6,7 +6,7 @@
 namespace Microsoft.Maui.Controls.Shapes
 {
 	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Polyline.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.Polyline']/Docs/*" />
-	[ElementHandler<PolylineHandler>]
+	[ElementHandler(typeof(PolylineHandler))]
 	public sealed partial class Polyline : Shape, IShape
 	{
 		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Polyline.xml" path="//Member[@MemberName='.ctor'][1]/Docs/*" />
diff --git a/src/Controls/src/Core/Shapes/Rectangle.cs b/src/Controls/src/Core/Shapes/Rectangle.cs
index e3cee4127666..f747bd388384 100644
--- a/src/Controls/src/Core/Shapes/Rectangle.cs
+++ b/src/Controls/src/Core/Shapes/Rectangle.cs
@@ -7,7 +7,7 @@
 namespace Microsoft.Maui.Controls.Shapes
 {
 	/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Rectangle.xml" path="Type[@FullName='Microsoft.Maui.Controls.Shapes.Rectangle']/Docs/*" />
-	[ElementHandler<RectangleHandler>]
+	[ElementHandler(typeof(RectangleHandler))]
 	public sealed partial class Rectangle : Shape, IShape
 	{
 		/// <include file="../../../docs/Microsoft.Maui.Controls.Shapes/Rectangle.xml" path="//Member[@MemberName='.ctor']/Docs/*" />
diff --git a/src/Controls/src/Core/Shapes/RoundRectangle.cs b/src/Controls/src/Core/Shapes/RoundRectangle.cs
index 5a0947a55ae9..535fa48266f1 100644
--- a/src/Controls/src/Core/Shapes/RoundRectangle.cs
+++ b/src/Controls/src/Core/Shapes/RoundRectangle.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.Maui.Controls.Shapes
 {
-	[ElementHandler<RoundRectangleHandler>]
+	[ElementHandler(typeof(RoundRectangleHandler))]
 	public sealed partial class RoundRectangle : Shape, IShape, IRoundRectangle
 	{
 		public RoundRectangle() : base()
diff --git a/src/Controls/src/Core/Shell/Shell.cs b/src/Controls/src/Core/Shell/Shell.cs
index ebd07e8406df..702004a38746 100644
--- a/src/Controls/src/Core/Shell/Shell.cs
+++ b/src/Controls/src/Core/Shell/Shell.cs
@@ -24,11 +24,11 @@ namespace Microsoft.Maui.Controls
 	[ContentProperty(nameof(Items))]
 	[DebuggerTypeProxy(typeof(ShellDebugView))]
 #if ANDROID || IOS || MACCATALYST
-	[ElementHandler<Handlers.Compatibility.ShellRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.ShellRenderer))]
 #elif WINDOWS
-	[ElementHandler<ShellHandler>]
+	[ElementHandler(typeof(ShellHandler))]
 #elif TIZEN
-	[ElementHandler<ShellHandler>]
+	[ElementHandler(typeof(ShellHandler))]
 #endif
 	public partial class Shell : Page, IShellController, IPropertyPropagationController, IPageContainer<Page>, IFlyoutView
 	{
diff --git a/src/Controls/src/Core/Shell/ShellContent.cs b/src/Controls/src/Core/Shell/ShellContent.cs
index 2f8cdb37d5a3..24be8c19124d 100644
--- a/src/Controls/src/Core/Shell/ShellContent.cs
+++ b/src/Controls/src/Core/Shell/ShellContent.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Maui.Controls
 	[ContentProperty(nameof(Content))]
 	[TypeConverter(typeof(ShellContentConverter))]
 #if WINDOWS
-	[ElementHandler<Handlers.ShellContentHandler>]
+	[ElementHandler(typeof(Handlers.ShellContentHandler))]
 #endif
 	public class ShellContent : BaseShellItem, IShellContentController, IVisualTreeElement
 	{
diff --git a/src/Controls/src/Core/Shell/ShellItem.cs b/src/Controls/src/Core/Shell/ShellItem.cs
index 1135b52ddeba..737b90b1da01 100644
--- a/src/Controls/src/Core/Shell/ShellItem.cs
+++ b/src/Controls/src/Core/Shell/ShellItem.cs
@@ -15,7 +15,7 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../../docs/Microsoft.Maui.Controls/FlyoutItem.xml" path="Type[@FullName='Microsoft.Maui.Controls.FlyoutItem']/Docs/*" />
 	[EditorBrowsable(EditorBrowsableState.Always)]
 #if WINDOWS || TIZEN
-	[ElementHandler<ShellItemHandler>]
+	[ElementHandler(typeof(ShellItemHandler))]
 #endif
 	public class FlyoutItem : ShellItem
 	{
diff --git a/src/Controls/src/Core/Shell/ShellSection.cs b/src/Controls/src/Core/Shell/ShellSection.cs
index d8371a778e52..312b45072d45 100644
--- a/src/Controls/src/Core/Shell/ShellSection.cs
+++ b/src/Controls/src/Core/Shell/ShellSection.cs
@@ -25,7 +25,7 @@ public class Tab : ShellSection
 	[TypeConverter(typeof(ShellSectionTypeConverter))]
 	[DebuggerTypeProxy(typeof(ShellSectionDebugView))]
 #if WINDOWS || TIZEN
-	[ElementHandler<Handlers.ShellSectionHandler>]
+	[ElementHandler(typeof(Handlers.ShellSectionHandler))]
 #endif
 	public partial class ShellSection : ShellGroupItem, IShellSectionController, IPropertyPropagationController, IVisualTreeElement, IStackNavigation
 	{
diff --git a/src/Controls/src/Core/Slider/Slider.cs b/src/Controls/src/Core/Slider/Slider.cs
index 078d41a24416..9dc78cb968c6 100644
--- a/src/Controls/src/Core/Slider/Slider.cs
+++ b/src/Controls/src/Core/Slider/Slider.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/Slider.xml" path="Type[@FullName='Microsoft.Maui.Controls.Slider']/Docs/*" />
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<SliderHandler>]
+	[ElementHandler(typeof(SliderHandler))]
 	public partial class Slider : View, ISliderController, IElementConfiguration<Slider>, ISlider
 	{
 		/// <summary>Bindable property for <see cref="Minimum"/>.</summary>
diff --git a/src/Controls/src/Core/Stepper/Stepper.cs b/src/Controls/src/Core/Stepper/Stepper.cs
index e9cf0cb59c9f..680ebd5875eb 100644
--- a/src/Controls/src/Core/Stepper/Stepper.cs
+++ b/src/Controls/src/Core/Stepper/Stepper.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/Stepper.xml" path="Type[@FullName='Microsoft.Maui.Controls.Stepper']/Docs/*" />
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<StepperHandler>]
+	[ElementHandler(typeof(StepperHandler))]
 	public partial class Stepper : View, IElementConfiguration<Stepper>, IStepper
 	{
 		/// <summary>Bindable property for <see cref="Maximum"/>.</summary>
diff --git a/src/Controls/src/Core/SwipeView/SwipeItem.cs b/src/Controls/src/Core/SwipeView/SwipeItem.cs
index 590b10983409..89f53cabe32b 100644
--- a/src/Controls/src/Core/SwipeView/SwipeItem.cs
+++ b/src/Controls/src/Core/SwipeView/SwipeItem.cs
@@ -6,7 +6,7 @@
 namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/SwipeItem.xml" path="Type[@FullName='Microsoft.Maui.Controls.SwipeItem']/Docs/*" />
-	[ElementHandler<SwipeItemMenuItemHandler>]
+	[ElementHandler(typeof(SwipeItemMenuItemHandler))]
 	public partial class SwipeItem : MenuItem, Controls.ISwipeItem, Maui.ISwipeItemMenuItem
 	{
 		/// <summary>Bindable property for <see cref="BackgroundColor"/>.</summary>
diff --git a/src/Controls/src/Core/SwipeView/SwipeItemView.cs b/src/Controls/src/Core/SwipeView/SwipeItemView.cs
index ffc6cd7a51a5..821955aadc0d 100644
--- a/src/Controls/src/Core/SwipeView/SwipeItemView.cs
+++ b/src/Controls/src/Core/SwipeView/SwipeItemView.cs
@@ -8,7 +8,7 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/SwipeItemView.xml" path="Type[@FullName='Microsoft.Maui.Controls.SwipeItemView']/Docs/*" />
 	[ContentProperty(nameof(Content))]
 #if ANDROID || IOS || MACCATALYST || TIZEN
-	[ElementHandler<SwipeItemViewHandler>]
+	[ElementHandler(typeof(SwipeItemViewHandler))]
 #endif
 	public partial class SwipeItemView : ContentView, Controls.ISwipeItem, Maui.ISwipeItemView
 	{
diff --git a/src/Controls/src/Core/SwipeView/SwipeView.cs b/src/Controls/src/Core/SwipeView/SwipeView.cs
index b6a3436e9728..5a398d1854eb 100644
--- a/src/Controls/src/Core/SwipeView/SwipeView.cs
+++ b/src/Controls/src/Core/SwipeView/SwipeView.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/SwipeView.xml" path="Type[@FullName='Microsoft.Maui.Controls.SwipeView']/Docs/*" />
 	[ContentProperty(nameof(Content))]
-	[ElementHandler<SwipeViewHandler>]
+	[ElementHandler(typeof(SwipeViewHandler))]
 	public partial class SwipeView : ContentView, IElementConfiguration<SwipeView>, ISwipeViewController, ISwipeView, IVisualTreeElement
 	{
 		readonly Lazy<PlatformConfigurationRegistry<SwipeView>> _platformConfigurationRegistry;
diff --git a/src/Controls/src/Core/Switch/Switch.cs b/src/Controls/src/Core/Switch/Switch.cs
index 2170806cdac4..57b592664e24 100644
--- a/src/Controls/src/Core/Switch/Switch.cs
+++ b/src/Controls/src/Core/Switch/Switch.cs
@@ -8,7 +8,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/Switch.xml" path="Type[@FullName='Microsoft.Maui.Controls.Switch']/Docs/*" />
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<SwitchHandler>]
+	[ElementHandler(typeof(SwitchHandler))]
 	public partial class Switch : View, IElementConfiguration<Switch>, ISwitch
 	{
 		/// <include file="../../docs/Microsoft.Maui.Controls/Switch.xml" path="//Member[@MemberName='SwitchOnVisualState']/Docs/*" />
diff --git a/src/Controls/src/Core/TabbedPage/TabbedPage.cs b/src/Controls/src/Core/TabbedPage/TabbedPage.cs
index aa5fdbf5db75..486e202c78dc 100644
--- a/src/Controls/src/Core/TabbedPage/TabbedPage.cs
+++ b/src/Controls/src/Core/TabbedPage/TabbedPage.cs
@@ -7,9 +7,9 @@ namespace Microsoft.Maui.Controls
 	/// <include file="../../docs/Microsoft.Maui.Controls/TabbedPage.xml" path="Type[@FullName='Microsoft.Maui.Controls.TabbedPage']/Docs/*" />
 	[ContentProperty(nameof(Children))]
 #if IOS || MACCATALYST
-	[ElementHandler<Handlers.Compatibility.NavigationRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.NavigationRenderer))]
 #elif WINDOWS || ANDROID || TIZEN
-	[ElementHandler<TabbedViewHandler>]
+	[ElementHandler(typeof(TabbedViewHandler))]
 #endif
 	public partial class TabbedPage : MultiPage<Page>, IBarElement, IElementConfiguration<TabbedPage>, ITabbedView
 	{
diff --git a/src/Controls/src/Core/TableView/TableView.cs b/src/Controls/src/Core/TableView/TableView.cs
index c4e52bc65837..fc36d8af333e 100644
--- a/src/Controls/src/Core/TableView/TableView.cs
+++ b/src/Controls/src/Core/TableView/TableView.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Maui.Controls
 	[ContentProperty(nameof(Root))]
 #if WINDOWS || IOS || MACCATALYST || TIZEN
 #pragma warning disable CS0618 // Type or member is obsolete
-	[ElementHandler<Handlers.Compatibility.TableViewRenderer>]
+	[ElementHandler(typeof(Handlers.Compatibility.TableViewRenderer))]
 #pragma warning restore CS0618 // Type or member is obsolete
 #elif ANDROID
 #pragma warning disable CS0618 // Type or member is obsolete
diff --git a/src/Controls/src/Core/TimePicker/TimePicker.cs b/src/Controls/src/Core/TimePicker/TimePicker.cs
index 56d2c31794ab..54ad0c766c58 100644
--- a/src/Controls/src/Core/TimePicker/TimePicker.cs
+++ b/src/Controls/src/Core/TimePicker/TimePicker.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Maui.Controls
 {
 	/// <include file="../../docs/Microsoft.Maui.Controls/TimePicker.xml" path="Type[@FullName='Microsoft.Maui.Controls.TimePicker']/Docs/*" />
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<TimePickerHandler>]
+	[ElementHandler(typeof(TimePickerHandler))]
 	public partial class TimePicker : View, IFontElement, ITextElement, IElementConfiguration<TimePicker>, ITimePicker
 	{
 		/// <summary>Bindable property for <see cref="Format"/>.</summary>
diff --git a/src/Controls/src/Core/Toolbar/Toolbar.cs b/src/Controls/src/Core/Toolbar/Toolbar.cs
index 3fdd06102ccd..39e369b0c55d 100644
--- a/src/Controls/src/Core/Toolbar/Toolbar.cs
+++ b/src/Controls/src/Core/Toolbar/Toolbar.cs
@@ -9,7 +9,7 @@
 namespace Microsoft.Maui.Controls
 {
 #if WINDOWS || ANDROID || TIZEN
-	[ElementHandler<ToolbarHandler>]
+	[ElementHandler(typeof(ToolbarHandler))]
 #endif
 	public partial class Toolbar : Maui.IToolbar, INotifyPropertyChanged
 	{
diff --git a/src/Controls/src/Core/WebView/WebView.cs b/src/Controls/src/Core/WebView/WebView.cs
index 1bf2561efd2b..3eceee49a454 100644
--- a/src/Controls/src/Core/WebView/WebView.cs
+++ b/src/Controls/src/Core/WebView/WebView.cs
@@ -21,7 +21,7 @@ namespace Microsoft.Maui.Controls
 	/// The WebView supports navigation events and JavaScript evaluation.
 	/// </remarks>
 	[DebuggerDisplay("{GetDebuggerDisplay(), nq}")]
-	[ElementHandler<WebViewHandler>]
+	[ElementHandler(typeof(WebViewHandler))]
 	public partial class WebView : View, IWebViewController, IElementConfiguration<WebView>, IWebView
 	{
 		/// <summary>Bindable property for <see cref="Source"/>.</summary>
diff --git a/src/Controls/src/Core/Window/Window.cs b/src/Controls/src/Core/Window/Window.cs
index 3b3e07e45818..18a1d51d268a 100644
--- a/src/Controls/src/Core/Window/Window.cs
+++ b/src/Controls/src/Core/Window/Window.cs
@@ -12,7 +12,7 @@
 namespace Microsoft.Maui.Controls
 {
 	[ContentProperty(nameof(Page))]
-	[ElementHandler<WindowHandler>]
+	[ElementHandler(typeof(WindowHandler))]
 	public partial class Window : NavigableElement, IWindow, IToolbarElement, IMenuBarElement, IFlowDirectionController, IWindowController
 	{
 		static readonly BindablePropertyKey IsActivatedPropertyKey = 
diff --git a/src/Core/src/Handlers/Element/ElementHandlerAttribute.cs b/src/Core/src/Handlers/Element/ElementHandlerAttribute.cs
index b5c1f08a26c1..fa96e73b8f02 100644
--- a/src/Core/src/Handlers/Element/ElementHandlerAttribute.cs
+++ b/src/Core/src/Handlers/Element/ElementHandlerAttribute.cs
@@ -1,28 +1,46 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.Maui.Handlers;
 
 [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
-internal abstract class ElementHandlerAttribute : Attribute
+internal class ElementHandlerAttribute : Attribute
 {
-	public abstract IElementHandler CreateHandler(IMauiContext context);
-	public abstract Type HandlerType { get; }
-}
+	public ElementHandlerAttribute([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] Type handlerType)
+	{
+		HandlerType = handlerType;
+	}
 
-internal sealed class ElementHandlerAttribute<THandler> : ElementHandlerAttribute
-	where THandler : IElementHandler, new()
-{
-	public override IElementHandler CreateHandler(IMauiContext context) => new THandler();
-	public override Type HandlerType => typeof(THandler);
+	public virtual IElementHandler CreateHandler(IMauiContext context)
+	{
+		object? handler = Activator.CreateInstance(HandlerType);
+		if (handler is IElementHandler elementHandler)
+		{
+			return elementHandler;
+		}
+
+		if (typeof(IElementHandler).IsAssignableFrom(HandlerType))
+		{
+			throw new InvalidOperationException($"Could not create an instance of handler type {HandlerType} for element handler. Ensure it has a public parameterless constructor.");
+		}
+		else
+		{
+			throw new InvalidOperationException($"The specified handler type {HandlerType} does not implement {nameof(IElementHandler)}.");
+		}
+	}
+
+	[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
+	public Type HandlerType { get; }
 }
 
 #if ANDROID
-internal sealed class ElementHandlerWithAndroidContextAttribute<THandler> : ElementHandlerAttribute
+internal sealed class ElementHandlerWithAndroidContextAttribute<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] THandler>
+	: ElementHandlerAttribute
 	where THandler : IElementHandler, IElementHandlerWithAndroidContext<THandler>
 {
-	public override IElementHandler CreateHandler(IMauiContext context)
-		=> THandler.CreateHandler(context.Context!); // TODO: revisit nullability
+	public ElementHandlerWithAndroidContextAttribute() : base(typeof(THandler)) { }
 
-	public override Type HandlerType => typeof(THandler);
+	public override IElementHandler CreateHandler(IMauiContext context)
+		=> THandler.CreateHandler(context.Context);
 }
 #endif
diff --git a/src/Core/src/Handlers/IElementHandler.cs b/src/Core/src/Handlers/IElementHandler.cs
index bd8fd32f02a9..e6c83b3e5cf9 100644
--- a/src/Core/src/Handlers/IElementHandler.cs
+++ b/src/Core/src/Handlers/IElementHandler.cs
@@ -56,7 +56,7 @@ public interface IElementHandler
 	internal interface IElementHandlerWithAndroidContext<THandler>
 		where THandler : IElementHandler
 	{
-		static abstract THandler CreateHandler(global::Android.Content.Context context);
+		static abstract THandler CreateHandler(global::Android.Content.Context? context);
 	}
 #endif
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/View/ViewHandler.Windows.cs b/src/Core/src/Handlers/View/ViewHandler.Windows.cs
index 29439d0327c4..e4b63e9a3469 100644
--- a/src/Core/src/Handlers/View/ViewHandler.Windows.cs
+++ b/src/Core/src/Handlers/View/ViewHandler.Windows.cs
@@ -190,36 +190,7 @@ internal static void MapContextFlyout(IElementHandler handler, IContextFlyoutEle
 		}
 	}
 
-<<<<<<< HEAD
-		internal virtual bool PreventGestureBubbling => false;
-||||||| 3f26a592b2
-		internal virtual bool PreventGestureBubbling
-			=> this switch
-			{
-				ButtonHandler => true,
-				DatePickerHandler => true,
-				StepperHandler => true,
-				SliderHandler => true,
-				SwitchHandler => true,
-				TimePickerHandler => true,
-				ImageButtonHandler => true,
-				RadioButtonHandler => true,
-				_ => false,
-			};
-=======
-	internal virtual bool PreventGestureBubbling
-		=> this switch
-		{
-			ButtonHandler => true,
-			DatePickerHandler => true,
-			StepperHandler => true,
-			SliderHandler => true,
-			SwitchHandler => true,
-			TimePickerHandler => true,
-			ImageButtonHandler => true,
-			RadioButtonHandler => true,
-			_ => false,
-		};
+	internal virtual bool PreventGestureBubbling => false;
 
 	static void FocusManager_GotFocus(object? sender, FocusManagerGotFocusEventArgs e)
 	{
@@ -250,6 +221,5 @@ private protected void UpdateIsFocused(bool isFocused)
 		{
 			virtualView.IsFocused = isFocused;
 		}
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
 	}
 }
diff --git a/src/Core/src/RuntimeFeature.cs b/src/Core/src/RuntimeFeature.cs
index 2f939f572c3c..0f0e0cde2f26 100644
--- a/src/Core/src/RuntimeFeature.cs
+++ b/src/Core/src/RuntimeFeature.cs
@@ -14,24 +14,6 @@ namespace Microsoft.Maui
 	/// </remarks>
 	static class RuntimeFeature
 	{
-<<<<<<< HEAD
-		private const bool IsIVisualAssemblyScanningEnabledByDefault = false;
-		private const bool IsShellSearchResultsRendererDisplayMemberNameSupportedByDefault = true;
-		private const bool IsQueryPropertyAttributeSupportedByDefault = true;
-		private const bool IsImplicitCastOperatorsUsageViaReflectionSupportedByDefault = true;
-		private const bool AreBindingInterceptorsSupportedByDefault = true;
-		private const bool IsXamlCBindingWithSourceCompilationEnabledByDefault = false;
-		private const bool IsHybridWebViewSupportedByDefault = true;
-		private const bool IsCssEnabledByDefault = true;
-||||||| 3f26a592b2
-		private const bool IsIVisualAssemblyScanningEnabledByDefault = false;
-		private const bool IsShellSearchResultsRendererDisplayMemberNameSupportedByDefault = true;
-		private const bool IsQueryPropertyAttributeSupportedByDefault = true;
-		private const bool IsImplicitCastOperatorsUsageViaReflectionSupportedByDefault = true;
-		private const bool AreBindingInterceptorsSupportedByDefault = true;
-		private const bool IsXamlCBindingWithSourceCompilationEnabledByDefault = false;
-		private const bool IsHybridWebViewSupportedByDefault = true;
-=======
 		const string FeatureSwitchPrefix = "Microsoft.Maui.RuntimeFeature";
 
 		const bool IsIVisualAssemblyScanningEnabledByDefault = false;
@@ -45,7 +27,7 @@ static class RuntimeFeature
 		const bool EnableDiagnosticsByDefault = false;
 		const bool IsMeterSupportedByDefault = true;
 		const bool EnableAspireByDefault = true;
->>>>>>> 485b400ee4a317af11647f3e64085d7d8d4d5f17
+		const bool IsCssEnabledByDefault = true;
 
 #pragma warning disable IL4000 // Return value does not match FeatureGuardAttribute 'System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute'. 
 #if NET9_0_OR_GREATER
@@ -175,6 +157,5 @@ internal set
 			AppContext.TryGetSwitch("Microsoft.Maui.RuntimeFeature.IsCssEnabled", out bool isEnabled)
 				? isEnabled
 				: IsCssEnabledByDefault;
-#pragma warning restore IL4000
 	}
 }