added local config
merging? maybe?