fixed conflict aftermath

oooops