fixed conflict that got through