re-configured files
merged re-configured files