Combined two config files into one