all mac
fix conflict in mac and fix author commiter