Solar energy firms merge