resolve refactorings