Conflict mega-mess fixed