some changes
merged files