Git: Case Study and Capstone - Understanding and Fixing Merge Conflicts Note: this advice is for Team projects only - not