The city of Edinburg has fixed the water main break and the boil order has been lifted. A boil order had been in effect for the last two days as the city worked to fix the break. Everything has been fixed and the boil order has been lifted. The boil order was lifted at 9:59 Friday morning. For more information contact the city of Edinburg at 623-5542.