Fix more merge conflicts.
Fix datasets resource