merge data-refactoring