fixed conflict error

fixed conflict error