finally a simple merge