Actually fixed conflict