update moisture_controller
merge and fix conflit