commit in mac
merge