Betere diffs en merges