merge without refactoring