Can anyone help me? I have recently had my 2012 MacBook in for repair. I used a 2006 MacMini with a TimeMachine restore of my MBP in the mean time. I now have my laptop back and would like to carry on using that but have since made some changes to files etc on my Mac Mini. How do I merge the two? I want to revert back from my MacMini to MBP. Can I restore the backup from my MacMini back? Is there any way to merge?