Merged and corrected configuration-all