Refactor merge