fixed redeal
merged files