edited some files
merged files