fix conflict has been addressed
fix conflict has been addressed

jarifibrahim/climate,MBoustani/climate,MBoustani/climate,MJJoyce/climate,MBoustani/climate,huikyole/climate,MJJoyce/climate,agoodm/climate,MJJoyce/climate,apache/climate,agoodm/climate,lewismc/climate,apache/climate,MJJoyce/climate,apache/climate,apache/climate,Omkar20895/climate,lewismc/climate,lewismc/climate,jarifibrahim/climate,apache/climate,Omkar20895/climate,huikyole/climate,lewismc/climate,jarifibrahim/climate,agoodm/climate,MBoustani/climate,Omkar20895/climate,agoodm/climate,huikyole/climate,MBoustani/climate,agoodm/climate,Omkar20895/climate,MJJoyce/climate,jarifibrahim/climate,jarifibrahim/climate,lewismc/climate,huikyole/climate,huikyole/climate,Omkar20895/climate