https://videosashka.com/watch/FAaMNVzDt6E/resolving-merge-conflicts-in-git-pull-automatenow