I have Lightroom CC and Photoshop CC on a MacBook Pro (mid 2012). I also have Photoshop 6, in a separate subfolder. I just upgraded my OS X to El Capitan. I also recently updated my LR CC and PS CC to the latest versions. My new problem is that when I attempt to edit an existing PSD or TIFF image in PS CC, starting from LR, it opens in PS6 instead of PS CC. Lightroom behaves correctly when I ask it to edit a NEF (Nikon RAW) in PS CC. How can I reset LR to "point" to the right version of PS (CC that is) when editing existing PSD and TIFF files?