merging with mac
things from linux