added in a conflicted status indicator. Not too happy with the letters for them but not bad