simple merge
merge ok