changed my jobs
merge conf