fixed conflict text