corrected diff class (combined edits)