resolved refactoring conflicts