rm old merge option in fix-workspaces