Merge and Refactor