Oops. Merge tool SUCKS