mac defend
solve conflict