resolved conflicts

README.md

@@ -610,3 +610,37 @@ Windows has some buggy behaviors.
 - Author: [David Beauverd](https://github.com/Davidoutz)
 - Source code: [https://github.com/Davidoutz/MAUI-Jass](https://github.com/Davidoutz/MAUI-Jass)
 - Extra: A new game starts automatically whenever 4 players join a room. Therefore you should use at least 4 devices/emulators for the best user experience :)
+
+
+## [MAUIDelivery](https://github.com/hprez21/MAUIDelivery)
+
+MAUIDelivery: A beautiful delivery .NET MAUI APP 
+
+![MAUIDelivery](https://user-images.githubusercontent.com/9836726/187585035-1c943f33-d881-4572-977c-d560ae84c755.jpg)
+
+### Platforms
+
+Android, iOS.
+
+### Features:
+
+* Use all new .NET MAUI APIs: Startup, HostBuilder, etc.
+* Gradients
+* Frames
+* Custom Fonts
+* SkiaSharp.Extended (Lottie Animations)
+* Font Icons
+* Borders
+* DataTemplate Selectors
+* Converters
+* CollectionView with groups
+* Animations
+* DataTriggers
+
+### More information:
+- Author: [Héctor Pérez](https://github.com/hprez21)
+- Blog post: [How was the MAUIDelivery application created?](https://devs.school/how-was-the-mauidelivery-application-created/)
+- Source code: [https://github.com/hprez21/MAUIDelivery](https://github.com/hprez21/MAUIDelivery)
+
+### Running App
+https://user-images.githubusercontent.com/9836726/187584113-9e725430-562d-4d78-87e2-0affd2ede8e3.mp4