resolving changes