Improve handling of resource conflicts