Finally fixed conflict issues in settings