MattCrumpLab, (edited ) just started trying {conflicted}...it's interesting, I think I like it. For a recent #quartopub project I wasn't prepared for the small deluge of conflicts that I had to be explicit about, but it worked out in the end. #rstats