GitHub repository: nomli/conflicts
Created: 2015-11-14T16:02:24Z
Description: test conflict resolve