removed the last remaining MERGE