Merged the two old setting files into the new one