fixed conflict error