Remove missed merge tags