merged changes manually from other mac