fixed the completionText
fixed conflict