Resolving Diff