Merge refactor.