https://programmingfields.com/resolving-git-conflicts-like-a-pro-tips-and-techniques/