Merge pull request #4872 from Cynthia-0203/fix/resource-conflict-service