Refactor last merging