Elon Musk said this week that it would have been a conflict of interest had Tesla Motors not merged with flailing solar panel producer SolarCity, despite several analysts saying the exact opposite. If shareholders approve, the fusion of the two companies would dramatically increase the size of Tesla’s workforce to 30,000 employees. It’ll help create a…