fix merge idmservice-Context.xml error
merg