refactoring
resolve coflicts