changed from ressource to resource
fixed merge conflicts