resolving uncommitted changes