resolved the customeresource conflict