change file name
merge conf