Modified location ressource
Fixed conflict