edit merge