GitHub repository: reimarschubert/conflict-test
Created: 2017-11-23T17:40:03Z
Description: Testing conflict resolution in Github