Merging files Ubuntu/Mac