merge conf and clean files