https://learnopedia.co/how-to-resolve-the-merge-conflicts-in-git/