Some tips on problem solving
Fix name and resource
Merge fix