fixed conflict better