probably could also take the id merge out here as it's handled in data now