solved merge