fixed Merges in conffig files