GitHub repository: DisciplineIsEverything/TestConflicts
Created: 2021-12-12T18:16:11Z
Description: Test how to resolve confilicts