removed devisoin by zero error
merged files