Merge Refactor