removed merge drivers and config files from working tree
ignored config files while absent from working tree