Add a git-merge-conflict icon

[julczka]

Icon name

git-merge-conflict

Use cases

To indicate a merge conflict in git flow

Design ideas

Could also be a git-merge icon with exclamation mark

Checklist

• [x] I have searched if someone has submitted a similar issue before and there weren't any. (Please make sure to also search closed issues, as this issue might already have been resolved.)
• [x] I have searched existing icons to make sure it does not already exist and I didn't find any.
• [x] I am not requesting a brand logo and the art is not protected by copyright.
• [x] I am not requesting an icon that includes religious, political imagery or hate symbols.
• [x] I have provided appropriate use cases for the icon(s) requested.