Fix merge conflicts in data downloads