adding config file
auto merge