plural => no apostrophe :-)
Merge branch 'root-resource'