conflict fix plz work