settings fixtures added
merged