https://thefullcircleacademy.com/managing-codebase-conflicts-efficiently/