Refactor Merge