Diff resolve