actually fixed conflict