Mark conflicts as accepted

Looking for a feature to 'accept a conflict' and turn it back to black or add a check box or another way to address conflicts.