change in mac
resolove confliect