commit changes from machine
merge in from mac