GitHub repository: thinkforcode/conflict
Primary language: HTML
Description: to solve conflict