merge in updates to new fs