merge changes into generic