First version with very simple merge working