refactoring
resolving merge