iMac reset to working files
iMac resolved conflicts with blank files from MBA