algo changes
merged files