Modified TestRessource.
Fixed conflicts.