fixingconflict