updates to diffconflictsr

(suck-tastic-commit-message)