update refactoring
resolved conflict