GitHub repository: rbailey000/conflicts
Created: 2022-05-05T20:15:02Z
Description: demo on how to handle conflicts