git-merge-conflict icon

Category