unable to transfer music to phone due to itunes match
I upgraded my 6 plus today to have Apple Music and now whenever I try to add any music from my Macbook I get an error in iTunes saying that "Some of the files were not copied to the iPhone “iPhone” because iTunes Match is enabled on this iPhone." I have never subscribed to iTunes match and really don't care to. Everything I've researched says that Apple Music and iTunes match are separate but do compliment each other. I was able to put some new music onto my phone Monday night before the 8.4 update released but now can't. When I go into my phone I have no option to turn off iTunes match, only the option to subscribe. Same on my laptop but still am unable to add music manually. Has anyone else came across this and have any ideas how to fix this?
MacBook Pro (13-inch Mid 2009), OS X Yosemite (10.10.2)