When I used iPhoto, I stored my iPhoto library on my Time Capsule due to lack of space on my MacBook Pro. So, when I started using Photos, it created an album on laptop (pictures & videos when I was using iCloud Photos Beta). Then, converted my album on my Time Capsule from iPhoto to Photos. However, now I can't figure out how to merge that with the one on my desktop. When I tried making it my default library like I read, it wouldn't let me use iCloud because it was on my Time Capsule and not my actual laptop. How can I get that library to merge with my other iCloud Photos library so I can have all 15,000 or so pictures in one library on my iCloud Photos. Also, will I be able to put my one Photos library file on my laptop since it will technically store the pictures in iCloud? Thanks for all the help.