Lazy merge between Mac OSX and Linux