Fix some service conflict

Sorry, I might cause some conflict