Simplify resolving