Merged with file on MBP