Just a simple merge