making moar conflicts