Macy's Strike Avoided, Union Reaches Deal