chore: Adjust docs

doc/articles/uno-build-error-codes.md

@@ -123,8 +123,6 @@ On iOS and Catalyst, calling `Dispose()` or `Dispose(bool)` on a type inheriting
 
 Invocations to `Dispose` can cause the application to crash in `__NSObject_Disposer drain`, cause `ObjectDisposedException` exception to be thrown. More information can be found in [xamarin/xamarin-macios#19493](https://github.com/xamarin/xamarin-macios/issues/19493).
 
-<<<<<<< HEAD
-=======
 ### UNO0006
 
 **Call 'InitializeComponent()' from code-behind**
@@ -140,7 +138,6 @@ Some components like `ProgressRing` and `MediaPlayerElement` requires you to ref
 - For `ProgressRing`, it requires Lottie dependency. For more information about adding Lottie to your project, see [Lottie for Uno](xref:Uno.Features.Lottie).
 - For `MediaPlayerElement` on WebAssembly or Gtk, it requires `Uno.WinUI.MediaPlayer.WebAssembly` or `Uno.WinUI.MediaPlayer.Skia.Gtk` NuGet package. For more information, see [MediaPlayerElement](xref:Uno.Controls.MediaPlayerElement).
 
->>>>>>> 722b2e8f7b (feat: Add analyzer for missing packages when using ProgressRing or MPE)
 ## XAML Errors
 
 ### UNOX0001