1.3 rewrite merge