cleaning modules
improved puppet configurations
resolved conflict