GitHub repository: warrior0986/merge_conflicts_2
Primary language: HTML
Description: TEsting merge conflicts