weird conflict fix