GitHub repository: ztaylor2/merge-conflict-lab
Created: 2017-07-28T20:17:12Z
Description: practicing with merge conflicts