Resolving diff