mix with macbook config (resolve latter)
merge w/ change from github