GitHub repository: nbriz/intentional-merge-conflict
Created: 2018-10-24T14:31:20Z
Description: demoing merge conflicts