adding solar panels
fixed conflict