accepts his own diffs