merge config file from master