Merge solar collector to master