comments from mac
merge conflict fix - mac