removed old directories from merge mismatch.