clean up the diff