keep config file from merging
keep config file from merging