Spring context ambiguity fixed