refactoring
conflict resolved