Conflictos GIT

 https://phoenixnap.com/kb/how-to-resolve-merge-conflicts-in-git

https://www.youtube.com/watch?v=H2DuJNWbqLw&t=1s