changed analysis
merged conflict in analysos