merge conflict sharp icon