test trying to merge on mac