Icon
 

How to resolve merge conflicts in Git